summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-04 08:14:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-04 08:14:22 -0700
commitec0337e089b21d1d81e23d31807a9b02df11daac (patch)
treecef4dfcfa876cf1d4c54e346f263f85c14498071 /init
parent5c65e7be4cbb015e39759275746f31bb6fa74f77 (diff)
parenta5cba18c4de288335a975b5d57b68f6787330985 (diff)
downloadlinux-ec0337e089b21d1d81e23d31807a9b02df11daac.tar.gz
linux-ec0337e089b21d1d81e23d31807a9b02df11daac.tar.bz2
linux-ec0337e089b21d1d81e23d31807a9b02df11daac.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull second round of input updates from Dmitry Torokhov: "A new driver for Weida wdt87xx touch controllers, and a bunch of fixups for other drivers" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wdt87xx_i2c - add a scaling factor for TOUCH_MAJOR event Input: wdt87xx_i2c - remove stray newline in diagnostic message Input: arc_ps2 - add HAS_IOMEM dependency Input: wdt87xx_i2c - fix format warning Input: improve parsing OF parameters for touchscreens Input: edt-ft5x06 - mark as direct input device Input: use for_each_set_bit() where appropriate Input: add a driver for wdt87xx touchscreen controller Input: axp20x-pek - fix reporting button state as inverted Input: xpad - re-send LED command on present event Input: xpad - set the LEDs properly on XBox Wireless controllers Input: imx_keypad - check for clk_prepare_enable() error
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions