]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
authorLen Brown <len.brown@intel.com>
Wed, 28 Jan 2004 20:05:25 +0000 (15:05 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 28 Jan 2004 20:05:25 +0000 (15:05 -0500)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.1

1  2 
arch/i386/kernel/acpi/boot.c

Simple merge