Merge branch 'for-linus' of git://github.com/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Oct 2011 16:22:38 +0000 (09:22 -0700)
* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - revert "Cintiq 21UX2 does not have menu strips"


Trivial merge