]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jun 2013 02:12:46 +0000 (16:12 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jun 2013 02:12:46 +0000 (16:12 -1000)
commita092ded1d00b1f56b9152930dc46305d26cc941e
tree83386b43591bd152352c5f967829c89cb9de85da
parent6bdd469d2c68b3dc7cfdd0d32114980c700f4289
parentdb126ad67918e1b1500215425ce0329f7c70766b
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input subsystem updates from Dmitry Torokhov:
 "A few small fixups for cyttsp, wacom and xpad drivers"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
  Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
  Input: add missing dependencies on CONFIG_HAS_IOMEM
  Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers
  Input: cyttsp - add missing handshake
  Input: cyttsp - fix memcpy size param
drivers/input/keyboard/Kconfig