Merge branch 'for-3.15/i2c-hid' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 16:56:31 +0000 (18:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 16:56:31 +0000 (18:56 +0200)
1  2 
drivers/hid/i2c-hid/i2c-hid.c

Simple merge