Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 22:13:26 +0000 (15:13 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 22:13:26 +0000 (15:13 -0700)
commitd3b8a1a8496c83bc4a3cc76505c29255af15572c
treeb56eb3ef27117bad5c516d6b647bdcd465d7659a
parent60564a313a5738960064d6c555ec066d9332f278
parent0ed0c0c48c508578c30aa58f755ca0d692636906
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6
drivers/usb/Makefile
drivers/usb/input/ati_remote.c