]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.0/upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 11 Mar 2015 16:13:43 +0000 (12:13 -0400)
committerJiri Kosina <jkosina@suse.cz>
Wed, 11 Mar 2015 16:13:43 +0000 (12:13 -0400)
1  2 
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c

Simple merge
Simple merge