]> git.hungrycats.org Git - linux/commit
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
authorLen Brown <len.brown@intel.com>
Tue, 27 Jan 2004 19:19:58 +0000 (14:19 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 27 Jan 2004 19:19:58 +0000 (14:19 -0500)
commit0b18c35a58b3a84912d3ac57c723d017e343872d
treeb4c03ea20a24f6813d8a90809d09fe1f9c20a0ba
parent573d821f52beb79c8db084917bb21b365f6d583d
parenta2e1b35b1ccdd67e9f1b7a0c83d39968059286ca
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
into intel.com:/home/lenb/src/linux-acpi-test-2.6.1
arch/i386/kernel/acpi/boot.c
arch/ia64/kernel/acpi.c
arch/ia64/kernel/iosapic.c