]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 22 Jul 2013 14:16:50 +0000 (16:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Jul 2013 14:16:50 +0000 (16:16 +0200)
1  2 
drivers/hid/hid-logitech-dj.c

Simple merge