]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/bk/linux-2.6.0
authorLen Brown <len.brown@intel.com>
Wed, 19 Nov 2003 06:33:08 +0000 (01:33 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 19 Nov 2003 06:33:08 +0000 (01:33 -0500)
into intel.com:/home/lenb/bk/linux-acpi-test-2.6.0

1  2 
arch/i386/kernel/mpparse.c

Simple merge