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)
1  2 
drivers/usb/Makefile
drivers/usb/input/ati_remote.c

Simple merge
Simple merge