summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat-koneplus.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-05 18:22:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-05 18:22:38 +0200
commit538d2882213ef4f076108f3edda2c39a584c4c2b (patch)
tree130e954abe7c63a49b7a99fcac1dfacb5c5edc1d /drivers/hid/hid-roccat-koneplus.c
parentMerge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6 (diff)
parentInput: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff)
downloadlinux-538d2882213ef4f076108f3edda2c39a584c4c2b.tar.xz
linux-538d2882213ef4f076108f3edda2c39a584c4c2b.zip
Merge branch 'for-linus' of git://github.com/dtor/input
* 'for-linus' of git://github.com/dtor/input: Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
Diffstat (limited to 'drivers/hid/hid-roccat-koneplus.c')
0 files changed, 0 insertions, 0 deletions