Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500)
committerDmitry Torokhov <dtor@insightbb.com>
Sat, 10 Feb 2007 06:26:32 +0000 (01:26 -0500)
commitb22364c8eec89e6b0c081a237f3b6348df87796f
tree233a923281fb640106465d076997ff511efb6edf
parent2c8dc071517ec2843869024dc82be2e246f41064
parent66efc5a7e3061c3597ac43a8bb1026488d57e66b
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
drivers/input/touchscreen/Kconfig
drivers/usb/input/hid-ff.c
drivers/usb/input/hid-lgff.c