]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.11/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 Jun 2013 21:55:06 +0000 (23:55 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 Jun 2013 21:55:06 +0000 (23:55 +0200)
1  2 
drivers/hid/hid-input.c

Simple merge