]> git.hungrycats.org Git - linux/commit
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Tue, 19 Oct 2004 00:31:35 +0000 (17:31 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 19 Oct 2004 00:31:35 +0000 (17:31 -0700)
commit7081675f58b38ee61497b7a1ea206a7fde0d00ca
treeaeb558edb87dcd64bbe2f7168f3a5dfb7962dc73
parentc6fcf5a9eadb0aed33c07b4e829ca9c6614f3807
parenta4946826c30c56a5830326552a395c5b6afc13ef
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
drivers/pci/quirks.c
drivers/usb/input/hid-core.c