git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3a247b 2a4ab64)
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 07:30:41 +0000 (09:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 07:31:47 +0000 (09:31 +0200)
Merge reason: the SFI (Simple Firmware Interface) feature in the ACPI
              tree needs this cleanup, pull it into the APIC branch as
      well so that there's no interactions.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/acpi/boot.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/apic/es7000_32.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/apic/io_apic.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge
diff --cc arch/x86/kernel/apic/es7000_32.c
Simple merge
diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
Pandora Kernel Repository