tree b65c611a805e045aff76c9fa94e7dd92b731808a
parent 5b6e7f1c169db10632459c28f148011e039187bd
parent 6f4d0382e2a6d27045e223d8c452659477826650
author Linus Torvalds <torvalds@linux-foundation.org> 1347146459 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1347146459 -0700

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

Pull input subsystem updates from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - add support for EMR on Cintiq 24HD touch
  Input: i8042 - add Gigabyte T1005 series netbooks to noloop table
  Input: imx_keypad - reset the hardware before enabling
  Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS