Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:45:52 +0000 (10:45 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 21 Feb 2013 09:45:52 +0000 (10:45 +0100)
Conflicts:
drivers/hid/hid-core.c


Trivial merge