Merge commit 'v2.6.29-rc7' into next

diff --combined drivers/input/mouse/Kconfig
index e3855a7b5dac93230f05a91e96071660bbe9a513,9705f3a00a3d944a5e3883e3cdf2fce4de20a2e8..2a92e19c1509730b01d604791572c42bdc3696ba
--- 1/drivers/input/mouse/Kconfig
--- 2/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@@ -70,7 -70,7 +70,7 @@@ config MOUSE_PS2_SYNAPTIC
  config MOUSE_PS2_LIFEBOOK
        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
        default y
-       depends on MOUSE_PS2
+       depends on MOUSE_PS2 && X86
        help
          Say Y here if you have a Fujitsu B-series Lifebook PS/2
          TouchScreen connected to your system.
@@@ -292,15 -292,4 +292,15 @@@ config MOUSE_PXA930_TRKBAL
        help
          Say Y here to support PXA930 Trackball mouse.
  
 +config MOUSE_MAPLE
 +      tristate "Maple mouse (for the Dreamcast)"
 +      depends on MAPLE
 +      help
 +        This driver supports the Maple mouse on the SEGA Dreamcast.
 +
 +        Most Dreamcast users, who have a mouse, will say Y here.
 +
 +        To compile this driver as a module choose M here: the module will be
 +        called maplemouse.
 +
  endif