Merge branch 'multitouch' into device-groups
authorJiri Kosina <jkosina@suse.cz>
Sat, 5 May 2012 21:30:42 +0000 (23:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 5 May 2012 21:31:15 +0000 (23:31 +0200)
commit645832cce2955bdcd0c3166478b84ea7afd0ea53
tree5daea112580bc5467071423e1d7ea90dfb7cb4df
parent2c2110e90b5a859cea8eccad9d42a44da9bfdc2a
parent9ed326951806c424b42dcf2e1125e25a98fb13d1
Merge branch 'multitouch' into device-groups

I am merging multitouch branch into device-groups so that support
for Baanto device can be adjusted accordingly to the new autoloading
patches.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c