Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "A new driver for slidebar on Ideapad laptops and a bunch of assorted
  driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits)
  Input: add SYN_MAX and SYN_CNT constants
  Input: max11801_ts - convert to devm
  Input: egalax-ts - fix typo and improve text
  Input: MAINTAINERS - change maintainer for cyttsp driver
  Input: cyttsp4 - kill 'defined but not used' compiler warnings
  Input: add driver for slidebar on Lenovo IdeaPad laptops
  Input: omap-keypad - set up irq type from DT
  Input: omap-keypad - enable wakeup capability for keypad.
  Input: omap-keypad - clear interrupts on open
  Input: omap-keypad - convert to threaded IRQ
  Input: omap-keypad - use bitfiled instead of hardcoded values
  Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer()
  Input: wacom - fix error return code in wacom_probe()
  Input: as5011 - fix error return code in as5011_probe()
  Input: keyboard, serio - simplify use of devm_ioremap_resource
  Input: tegra-kbc - simplify use of devm_ioremap_resource
  Input: htcpen - fix incorrect placement of __initdata
  Input: qt1070 - add power management ops
  Input: wistron_btns - add MODULE_DEVICE_TABLE
  Input: wistron_btns - mark the Medion MD96500 keymap as tested
  ...

1 files changed, 9 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 10533173e153..e775ecaf5d1f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2494,9 +2494,9 @@ S:	Maintained
 F:      drivers/media/common/cypress_firmware*
 
 CYTTSP TOUCHSCREEN DRIVER
-M:      Javier Martinez Canillas <javier@dowhile0.org>
+M:      Ferruh Yigit <fery@cypress.com>
 L:      linux-input@vger.kernel.org
-S:      Maintained
+S:      Supported
 F:      drivers/input/touchscreen/cyttsp*
 F:      include/linux/input/cyttsp.h
 
@@ -4141,6 +4141,13 @@ W:	http://launchpad.net/ideapad-laptop
 S:      Maintained
 F:      drivers/platform/x86/ideapad-laptop.c
 
+IDEAPAD LAPTOP SLIDEBAR DRIVER
+M:      Andrey Moiseev <o2g.org.ru@gmail.com>
+L:      linux-input@vger.kernel.org
+W:      https://github.com/o2genum/ideapad-slidebar
+S:      Maintained
+F:      drivers/input/misc/ideapad_slidebar.c
+
 IDE/ATAPI DRIVERS
 M:      Borislav Petkov <bp@alien8.de>
 L:      linux-ide@vger.kernel.org