]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60564a3 0ed0c0c)
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 patch | diff1 | diff2 | blob | history
drivers/usb/input/ati_remote.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/Makefile
Simple merge
diff --cc drivers/usb/input/ati_remote.c
Simple merge
Linux 2.6 source tree