]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 14:55:39 +0000 (07:55 -0700)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 14:55:39 +0000 (07:55 -0700)
1  2 
drivers/hid/hid-ids.h

Simple merge