]> git.hungrycats.org Git - linux/commitdiff
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7-mpparse
authorLen Brown <len.brown@intel.com>
Wed, 16 Jun 2004 22:15:36 +0000 (18:15 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 16 Jun 2004 22:15:36 +0000 (18:15 -0400)
into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

1  2 
arch/x86_64/kernel/mpparse.c

Simple merge