]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linuxusb.bkbits.net/usb-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 14 Apr 2004 08:12:43 +0000 (01:12 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 14 Apr 2004 08:12:43 +0000 (01:12 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
include/linux/pci_ids.h

Simple merge