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: (40 commits)
  Input: wacom - add support for Cintiq 20WSX
  Input: ucb1400_ts - IRQ probe fix
  Input: at32psif - update MODULE_AUTHOR with new email
  Input: mac_hid - add lockdep annotation to emumousebtn
  Input: i8042 - fix incorrect usage of strncpy and strncat
  Input: bf54x-keys - add infrastructure for keypad wakeups
  Input: add MODULE_ALIAS() to hotpluggable platform modules
  Input: drivers/char/keyboard.c - use time_after
  Input: fix ordering in joystick Makefile
  Input: wm97xx-core - support use as a wakeup source
  Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
  Input: wm97xx-core - only schedule interrupt handler if not already scheduled
  Input: add Zhen Hua driver
  Input: aiptek - add support for Genius G-PEN 560 tablet
  Input: wacom - implement suspend and autosuspend
  Input: xpad - set proper buffer length for outgoing requests
  Input: omap-keypad - fix build warning
  Input: gpio_keys - irq handling cleanup
  Input: add PS/2 serio driver for AVR32 devices
  Input: put ledstate in the keyboard notifier
  ...

1 files changed, 10 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f50e927a1189..2edec00c12c0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4356,6 +4356,16 @@ L:	linux-wireless@vger.kernel.org
 W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
+WM97XX TOUCHSCREEN DRIVERS
+P:      Mark Brown
+M:      broonie@opensource.wolfsonmicro.com
+P:      Liam Girdwood
+M:      liam.girdwood@wolfsonmicro.com
+L:      linux-input@vger.kernel.org
+T:      git git://opensource.wolfsonmicro.com/linux-2.6-touch
+W:      http://opensource.wolfsonmicro.com/node/7
+S:      Supported
+
 X.25 NETWORK LAYER
 P:      Henner Eisen
 M:      eis@baty.hanse.de