]> 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)
commit3586dbeb1ff74b9b476cdd49004096f6cc109043
tree83386b43591bd152352c5f967829c89cb9de85da
parentd8a1267a63484851ded8dd6b0f261ee170ad73d5
parentdf351112c0692a6926a2c52b6c6af0fdbdef78bd
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