From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Sep 2012 23:20:59 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.6-rc5~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=11be4bc6a1ee7a824237e63b59d228956aa8c2a7;p=uclinux-h8%2Flinux.git

Merge branch 'for-linus' of git://git./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
---

11be4bc6a1ee7a824237e63b59d228956aa8c2a7