tree 2118a16701418af10d215d2174df7ee0a5cbe6bd
parent a146649bc19d5eba4f5bfac6720c5f252d517a71
parent 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c
author Ingo Molnar <mingo@elte.hu> 1233419551 +0100
committer Ingo Molnar <mingo@elte.hu> 1233869401 +0100

Merge branch 'x86/urgent' into x86/apic

Conflicts:
	arch/x86/mach-default/setup.c

Semantic merge:
	arch/x86/kernel/irqinit_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>