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

Simple merge
Simple merge