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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig

1 files changed, 2 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bcb78306b62f..78d317c545b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3065,8 +3065,10 @@ F:	drivers/input/
 INPUT MULTITOUCH (MT) PROTOCOL
 M:      Henrik Rydberg <rydberg@euromail.se>
 L:      linux-input@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
 S:      Maintained
 F:      Documentation/input/multi-touch-protocol.txt
+F:      drivers/input/input-mt.c
 K:      \b(ABS|SYN)_MT_
 
 INTEL IDLE DRIVER