]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit3a0c429cebb8a70426eb0dea3fa169cd616d2eed
tree8611c63071c9c09ec287c4cd29276b2222af7637
parent1ac51b852e11204b82e6cb6824bf182747267535
parent7e41576247b782a21c05f7ea8a78a6db119ba789
Merge branch 'for-3.9/steelseries' into for-next

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h