]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.9/ntrig' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 18 Feb 2013 09:17:03 +0000 (10:17 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Feb 2013 09:17:03 +0000 (10:17 +0100)
1  2 
drivers/hid/hid-ntrig.c

Simple merge