]> git.hungrycats.org Git - linux/commit
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
authorLen Brown <len.brown@intel.com>
Thu, 17 Jun 2004 21:56:40 +0000 (17:56 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 17 Jun 2004 21:56:40 +0000 (17:56 -0400)
commit0f09a7492759cc4b702f774e1ef722befae3b46d
tree3ce90e154f201481980bb9d67fce374de61bb070
parent8d642ac39669652b42719d83ffdf31cf61e6212c
parent4575a346a5b9704a7632a0a08bd1c8d4256a02b4
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
drivers/acpi/pci_link.c