]> git.hungrycats.org Git - linux/commit
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
authorLen Brown <len.brown@intel.com>
Mon, 21 Jun 2004 11:22:34 +0000 (07:22 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 21 Jun 2004 11:22:34 +0000 (07:22 -0400)
commita23245388ba8ee7cfe965b3e29ed12cbd8f54bc7
treede8a2f28965e240c922a12223344dadb5289a2ea
parent0f09a7492759cc4b702f774e1ef722befae3b46d
parent98469742ec8afed100a07ccbb34e26d415c91f2a
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7
arch/i386/kernel/mpparse.c
arch/x86_64/kernel/mpparse.c