Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...
authorJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:23:43 +0000 (16:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:23:43 +0000 (16:23 +0200)
Conflicts:
drivers/hid/wacom_wac.c


Trivial merge