]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 5 Oct 2015 18:38:34 +0000 (20:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 5 Oct 2015 18:38:34 +0000 (20:38 +0200)
1  2 
drivers/hid/hid-ids.h

Simple merge