]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.2/sony' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 7 May 2015 08:42:39 +0000 (10:42 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 7 May 2015 08:42:39 +0000 (10:42 +0200)
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge