Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Jun 2013 00:11:06 +0000 (09:11 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Jun 2013 00:11:06 +0000 (09:11 +0900)
Pull input fixes from Dmitry Torokhov:
 "Just a 2 small driver fixups here"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - fix a typo for Cintiq 22HDT
  Input: synaptics - fix sync lost after resume on some laptops


Trivial merge