]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.14/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 16 Dec 2013 12:23:41 +0000 (13:23 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 16 Dec 2013 12:23:41 +0000 (13:23 +0100)
1  2 
drivers/hid/hid-core.c

Simple merge