]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.5
authorLen Brown <len.brown@intel.com>
Fri, 30 Apr 2004 21:28:00 +0000 (17:28 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 30 Apr 2004 21:28:00 +0000 (17:28 -0400)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.6

1  2 
arch/i386/kernel/io_apic.c

Simple merge