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:
  Input: remove scan_keyb driver
  Input: i8042 - fix AUX IRQ delivery check
  Input: wistron - add support for Fujitsu-Siemens Amilo D88x0
  Input: inport - use correct config option for ATIXL
  Input: HIL - handle erros from input_register_device()
  Input: tsdev - schedule removal
  Input: add Atlas button driver
  Input: ads7846 - be more compatible with the hwmon framework
  Input: ads7846 - detect pen up from GPIO state
  Input: ads7846 - select correct SPI mode
  Input: ads7846 - switch to using hrtimer
  Input: ads7846 - optionally leave Vref on during differential measurements
  Input: ads7846 - pluggable filtering logic
  Input: gpio-keys - keyboard driver for GPIO buttons
  Input: hid-ff - add support for Logitech Momo racing wheel
  Input: i8042 - really suppress ACK/NAK during panic blink
  Input: pc110pad - return proper error

diff --combined Documentation/feature-removal-schedule.txt
index 8247a4b79d09e73775cb139de8dc2fedde44f86a,5d140dc0ea2b0a63289913591048e91698bfaa52..c585aa8d62b430fc4c052253f8db7fd38bd0e2cc
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -214,13 -214,6 +214,13 @@@ Who:     Jean Delvare <[email protected]>
        David Brownell <[email protected]>
  
  ---------------------------
 +
 +What:  drivers depending on OBSOLETE_OSS
 +When:  options in 2.6.22, code in 2.6.24
 +Why:   OSS drivers with ALSA replacements
 +Who:   Adrian Bunk <[email protected]>
 +
 +---------------------------
  
  What: IPv4 only connection tracking/NAT/helpers
  When: 2.6.22
@@@ -319,3 -312,18 +319,18 @@@ Why:    In kernel tree version of drive
        replaced by the skge driver. 
  Who:    Stephen Hemminger <[email protected]>
  
+ ---------------------------
+ 
+ What: Compaq touchscreen device emulation
+ When: Oct 2007
+ Files:        drivers/input/tsdev.c
+ Why:  The code says it was obsolete when it was written in 2001.
+       tslib is a userspace library which does anything tsdev can do and
+       much more besides in userspace where this code belongs. There is no
+       longer any need for tsdev and applications should have converted to
+       use tslib by now.
+       The name "tsdev" is also extremely confusing and lots of people have
+       it loaded when they don't need/use it.
+ Who:  Richard Purdie <[email protected]>
+ 
+ ---------------------------