Ingo Molnar fc6fc7f1b1 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>		2009-02-22 20:05:19 +01:00
..
include
kernel	Merge branch 'linus' into x86/apic	2009-02-22 20:05:19 +01:00
pci	[IA64] SN specific version of dma_get_required_mask()	2009-01-15 10:42:16 -08:00
Makefile