]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.2/upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.com>
Wed, 29 Jul 2015 13:06:00 +0000 (15:06 +0200)
committerJiri Kosina <jkosina@suse.com>
Wed, 29 Jul 2015 13:06:00 +0000 (15:06 +0200)
1  2 
drivers/hid/hid-input.c

Simple merge