]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.9/steelseries' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 31 Jan 2013 15:55:12 +0000 (16:55 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 31 Jan 2013 15:55:12 +0000 (16:55 +0100)
Conflicts:
drivers/hid/hid-core.c

1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge