]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.0/upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 15 Mar 2015 14:05:30 +0000 (10:05 -0400)
committerJiri Kosina <jkosina@suse.cz>
Sun, 15 Mar 2015 14:05:30 +0000 (10:05 -0400)
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge