]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.15/sony' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 17 Feb 2014 13:17:48 +0000 (14:17 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 17 Feb 2014 13:17:48 +0000 (14:17 +0100)
1  2 
drivers/hid/hid-input.c
drivers/hid/i2c-hid/i2c-hid.c

Simple merge
Simple merge