summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-01-08 01:08:19 +0100
committerJiri Kosina <jkosina@suse.cz>2011-01-08 01:08:19 +0100
commita7153258b70ccbe3922fcee9ca4271d4f4c2bc55 (patch)
tree12e17027af36846933908da64a1419491ea58676 /drivers/hid/hid-roccat.c
parentae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 (diff)
parent0fbf8ed976af5bb43cf9cf2492161eb9688fee0c (diff)
downloadlinux-a7153258b70ccbe3922fcee9ca4271d4f4c2bc55.tar.bz2
Merge branches 'upstream' and 'upstream-fixes' into for-linus
Diffstat (limited to 'drivers/hid/hid-roccat.c')
0 files changed, 0 insertions, 0 deletions