Merge branch 'for-linus' of git://github.com/dtor/input
commit538d2882213ef4f076108f3edda2c39a584c4c2b
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (5 09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (5 09:22 -0700)
tree130e954abe7c63a49b7a99fcac1dfacb5c5edc1d
parent71277a6635890ab401f0a9dd7d5d9e652eea44ef
parentd6069dae4700cf5290a75002c46b9be8ea7eef3c
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"