Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 22 Jul 2011 20:47:08 +0000 (22:47 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 22 Jul 2011 20:47:08 +0000 (22:47 +0200)
commita91f423e598912ab301592c7759cfd89e10682a1
treee6519241f27f4b3ea237121730f2b50984ec2c67
parent901e64dbdb5998b9248c372a401c921bbdf662f6
parentb580169affd7ccc9347cbf4d5f4db1480ee7ee06
parent3c1c2fce64fdfa2f0c0ff4fffb3bb171ea6361ca
Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c