tree 2ad451d5dac4d460830536944cef1de93be36b2a
parent ef1f87aa7ba6224bef1b750b3272ba281d8f43ed
parent 770824bdc421ff58a64db608294323571c949f4c
author Ingo Molnar <mingo@elte.hu> 1235329519 +0100
committer Ingo Molnar <mingo@elte.hu> 1235329519 +0100

Merge branch 'linus' into x86/apic

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

Semantic conflict resolution:
	arch/x86/kernel/setup.c

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