Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16...
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)

Trivial merge