| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 24 Jun 2013 02:12:46 +0000 (16:12 -1000) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 24 Jun 2013 02:12:46 +0000 (16:12 -1000) |
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
"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
| 1 | 2 | |||
|---|---|---|---|---|
| drivers/input/keyboard/Kconfig | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/input/keyboard/Kconfig
Simple merge