]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.16/i2c-hid' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 13 May 2014 09:21:38 +0000 (11:21 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 13 May 2014 09:21:38 +0000 (11:21 +0200)
1  2 
drivers/hid/hid-core.c
include/uapi/linux/input.h

Simple merge
Simple merge