]> git.hungrycats.org Git - linux/commit
Merge kroah.com:/home/linux/BK/bleed-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Fri, 20 Feb 2004 00:57:34 +0000 (16:57 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Fri, 20 Feb 2004 00:57:34 +0000 (16:57 -0800)
commit2e862d404ed35c1f4456b3061f2706678eaa019e
tree5cca30c6419d60ba27b3dd9af67968355e9a741a
parente665d1854c00a0f0b2b12bebb600470a2e123cb9
parent14810e1f31a9d8210d535e6243ccd712664cf573
Merge kroah.com:/home/linux/BK/bleed-2.6
into kroah.com:/home/linux/BK/pci-2.6
arch/arm/Kconfig
arch/i386/Kconfig
arch/ia64/Kconfig
arch/x86_64/Kconfig
include/linux/pci_ids.h