| commit | eebc57f73d42095b778e899f6aa90ad050c72655 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Sat, 29 Aug 2009 07:30:41 +0000 (29 09:30 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Sat, 29 Aug 2009 07:31:47 +0000 (29 09:31 +0200) | ||
| tree | 2ba80c75e9284093e6d7606dbb1b6a4bb752a2a5 | treesnapshot (tar.gz zip) |
| parent | d3a247bfb2c26f5b67367d58af7ad8c2efbbc6c1 | commitdiff |
| parent | 2a4ab640d3c28c2952967e5f63ea495555bf2a5f | commitdiff |
Merge branch 'for-ingo' of git://git./linux/kernel/git/lenb/linux-sfi-2.6 into x86/apic
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>
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>
| arch/x86/kernel/acpi/boot.c | diff1 | diff2 | blobhistory |
| arch/x86/kernel/apic/es7000_32.c | diff1 | diff2 | blobhistory |
| arch/x86/kernel/apic/io_apic.c | diff1 | diff2 | blobhistory |