Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into...
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:07 +0000 (10:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:07 +0000 (10:19 +0200)
commit047dff63f913c21c5228b94118e7996ab998cdc4
treeac0351e3242df1bcf69f9ecc66c3f9249318616a
parent72c16d9a5c303dce928a52a8861fe7a2a25f849a
parentb42065f31704686e69002343403f45fff863a120
parent89759e20d9571e0496c7e12fc4a3ce2a5233f18e
Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus

Conflicts:
drivers/hid/Kconfig
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lenovo-tpkbd.c
drivers/hid/hid-picolcd.h
drivers/hid/hid-steelseries.c