summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-roccat-common.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-01-05 18:51:02 +0400
committerJiri Kosina <jkosina@suse.cz>2012-01-05 18:51:02 +0400
commite0273728564a395a13cfed70e34da4f2613d2d44 (patch)
treee57de35badafff2cc3afcd8896479242b94cc3ec /drivers/hid/hid-roccat-common.c
parent74c4fb058083b47571a4f76dcfce95085f2d8098 (diff)
parent11576c6114c3b6505aea2e0c988bedb856a0e20c (diff)
parentd41c2a7011dffc60571eab8dc4e2a297ef106f44 (diff)
parent4371ea8202e98c8ef77ca887de3b19affbb3498f (diff)
parentcd07655e732b265eb12a5804ddf7ffae945c9ab9 (diff)
parent78761ff9bc4e944e0b4e5df1e7eedcfdbb1a9a1a (diff)
parent90120d66974ecf22c32d8cbb2347097ce4144403 (diff)
downloadlinux-e0273728564a395a13cfed70e34da4f2613d2d44.tar.xz
Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom' and 'wiimote' into for-linus