diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-05 18:22:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-05 18:22:38 +0200 |
commit | 538d2882213ef4f076108f3edda2c39a584c4c2b (patch) | |
tree | 130e954abe7c63a49b7a99fcac1dfacb5c5edc1d /drivers/hid/hid-roccat-koneplus.c | |
parent | Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6 (diff) | |
parent | Input: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff) | |
download | linux-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