Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and...
authorJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000 (10:42 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000 (10:42 +0100)
Conflicts:
drivers/hid/i2c-hid/i2c-hid.c


Trivial merge