Merge commit 'v2.6.39-rc4' into next

diff --combined drivers/input/touchscreen/Kconfig
index 6b2d441,434fd80..cabd9e5
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -248,18 -248,6 +248,18 @@@ config TOUCHSCREEN_LPC32X
          To compile this driver as a module, choose M here: the
          module will be called lpc32xx_ts.
  
 +config TOUCHSCREEN_MAX11801
 +      tristate "MAX11801 based touchscreens"
 +      depends on I2C
 +      help
 +        Say Y here if you have a MAX11801 based touchscreen
 +        controller.
 +
 +        If unsure, say N.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called max11801_ts.
 +
  config TOUCHSCREEN_MCS5000
        tristate "MELFAS MCS-5000 touchscreen"
        depends on I2C
@@@ -653,7 -641,7 +653,7 @@@ config TOUCHSCREEN_TOUCHIT21
  
  config TOUCHSCREEN_TSC2005
          tristate "TSC2005 based touchscreens"
-         depends on SPI_MASTER
+         depends on SPI_MASTER && GENERIC_HARDIRQS
          help
            Say Y here if you have a TSC2005 based touchscreen.