]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.12/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 2 Sep 2013 11:35:10 +0000 (13:35 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 2 Sep 2013 11:35:10 +0000 (13:35 +0200)
1  2 
drivers/hid/hid-ids.h

Simple merge