]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 24 Aug 2015 12:01:43 +0000 (14:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 24 Aug 2015 12:01:43 +0000 (14:01 +0200)
1  2 
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c

Simple merge
Simple merge