Merge commit 'v2.6.30-rc5' into next

diff --combined drivers/input/keyboard/Kconfig
index 76407df17cd71f74df0bde4f0dcd087522fee0a7,ea2638b4198226dfc7d2d69c87a387eea1df1df6..54775aaa7be77c23482588407da2c26ad87b1a75
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -13,11 -13,11 +13,11 @@@ menuconfig INPUT_KEYBOAR
  if INPUT_KEYBOARD
  
  config KEYBOARD_ATKBD
-       tristate "AT keyboard" if EMBEDDED || !X86_PC
+       tristate "AT keyboard" if EMBEDDED || !X86
        default y
        select SERIO
        select SERIO_LIBPS2
-       select SERIO_I8042 if X86_PC
+       select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
@@@ -332,14 -332,4 +332,14 @@@ config KEYBOARD_SH_KEYS
  
          To compile this driver as a module, choose M here: the
          module will be called sh_keysc.
 ++
 +config KEYBOARD_EP93XX
 +      tristate "EP93xx Matrix Keypad support"
 +      depends on ARCH_EP93XX
 +      help
 +        Say Y here to enable the matrix keypad on the Cirrus EP93XX.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called ep93xx_keypad.
 +
  endif