From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 17:01:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f1115bb686207a32c655602b870b9e2b6b2d32c0;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "A new driver for FT5x06 based EDT displays and a couple of other
  driver changes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - handle out of bounds values from the hardware
  Input: wacom - add support to Cintiq 22HD
  Input: add driver for FT5x06 based EDT displays
---

f1115bb686207a32c655602b870b9e2b6b2d32c0