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)
commitfed8bf19ec20efc0641740b2d10aa589dbd6d1ab
treec104a13c7b8cb7f4152b15729dc5aede7c063e91
parente7c3aad53dba54d375b632f2a21b680546828dec
parent46f25dffbaba48c571d75f5f574f31978287b8d2
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
drivers/usb/input/appletouch.c