summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-02-21 13:45:52 +0400
committerJiri Kosina <jkosina@suse.cz>2013-02-21 13:45:52 +0400
commit0d69a3c731e120b05b7da9fb976830475a3fbc01 (patch)
treef53647d8800028f27e37a60d227e35c0894be6c4 /drivers/hid
parent73759518d6d6b56e398791b7522328baf4181a82 (diff)
parent99d249021abd4341771523ed8dd7946276103432 (diff)
parent7e41576247b782a21c05f7ea8a78a6db119ba789 (diff)
downloadlinux-0d69a3c731e120b05b7da9fb976830475a3fbc01.tar.xz
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
Conflicts: drivers/hid/hid-core.c