Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for...
authorJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
Conflicts:
drivers/hid/hid-core.c


Trivial merge