]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7c3aad 46f25df)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Fri, 6 Jan 2006 03:25:13 +0000 (22:25 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Fri, 6 Jan 2006 03:25:13 +0000 (22:25 -0500)
1  2 
drivers/usb/input/appletouch.c patch | diff1 | diff2 | blob | history

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