summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-wacom.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-03-20 13:05:18 +0100
committerJiri Kosina <jkosina@suse.cz>2012-03-20 13:05:18 +0100
commit77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51 (patch)
treeb7a0675903455d2affe832e9da594cdcf94d2e56 /drivers/hid/hid-wacom.c
parentMerge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus (diff)
parentHID: roccat: Only one Kconfig entry for all roccat drivers (diff)
parentHID: wacom: Add reporting of wheel for Intuos4 WL (diff)
downloadlinux-77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51.tar.xz
linux-77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51.zip
Merge branches 'roccat' and 'wacom' into for-linus