]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.9/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 17 Jan 2013 10:07:48 +0000 (11:07 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 17 Jan 2013 10:07:48 +0000 (11:07 +0100)
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge