Merge gregkh@kernel.bkbits.net:linux/pci-2.6
commit6fcfa73a67460c4ed1266aaa602e5ae5bd474733
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 2 Aug 2004 15:36:44 +0000 (2 08:36 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 2 Aug 2004 15:36:44 +0000 (2 08:36 -0700)
tree19e18e14a4d8b4c076237b33c954f375cf7162a1
parent29b6d1fb371f1b73202d9f0356e423a244991076
parent9131d64734c5bf80199292219da1d799b855bdca
Merge gregkh@kernel.bkbits.net:linux/pci-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6