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)
commit0d69a3c731e120b05b7da9fb976830475a3fbc01
treef53647d8800028f27e37a60d227e35c0894be6c4
parent73759518d6d6b56e398791b7522328baf4181a82
parent99d249021abd4341771523ed8dd7946276103432
parent7e41576247b782a21c05f7ea8a78a6db119ba789
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c