tree 130e954abe7c63a49b7a99fcac1dfacb5c5edc1d
parent 71277a6635890ab401f0a9dd7d5d9e652eea44ef
parent d6069dae4700cf5290a75002c46b9be8ea7eef3c
author Linus Torvalds <torvalds@linux-foundation.org> 1317831758 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317831758 -0700

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"