]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 17 Sep 2012 11:20:44 +0000 (13:20 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 17 Sep 2012 11:20:44 +0000 (13:20 +0200)
1  2 
drivers/hid/hid-core.c

Simple merge