]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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

Simple merge