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)
Conflicts:
drivers/hid/Kconfig


Trivial merge