Ingo Molnar f8a6b2b9ce Merge branch 'linus' into x86/apic ... Conflicts: arch/x86/kernel/acpi/boot.c arch/x86/mm/fault.c		2009-02-13 09:44:22 +01:00
..
include	[IA64-SGI] Older PROM WAR for device flush code	2006-01-17 10:08:37 -08:00
kernel	Merge branch 'linus' into x86/apic	2009-02-13 09:44:22 +01:00
pci	[IA64] SN specific version of dma_get_required_mask()	2009-01-15 10:42:16 -08:00
Makefile	[IA64-SGI] Recursive flags do not work for selective builds	2006-01-26 13:17:34 -08:00