]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.3
authorLen Brown <len.brown@intel.com>
Sun, 29 Feb 2004 22:30:57 +0000 (17:30 -0500)
committerLen Brown <len.brown@intel.com>
Sun, 29 Feb 2004 22:30:57 +0000 (17:30 -0500)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.4

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

Simple merge