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

Simple merge
Simple merge