Merge /home/linnj/linux_ppc/linux-2.6 into master-2.6.37-rc4

diff --cc drivers/i2c/algos/Kconfig
index d483b1f278802c8bb8f2bcc1c7315d35c0f3a836,f1cfe7e5508bb1cf65a82fac5903472927c3d184..0e7a4eb725fef4a0324925493c4c0200c8a41441
--- 1/drivers/i2c/algos/Kconfig
--- 2/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@@ -14,21 -14,4 +14,9 @@@ config I2C_ALGOPC
  config I2C_ALGOPCA
        tristate "I2C PCA 9564 interfaces"
  
 +config XILINX_IIC
 +      tristate "Xilinx IIC interface"
 +      depends on I2C && XILINX_DRIVERS
 +      help
 +        Supports the Xilinx IIC interface.
  endmenu
- 
- # In automatic configuration mode, we still have to define the
- # symbols to avoid unmet dependencies.
- 
- if I2C_HELPER_AUTO
- config I2C_ALGOBIT
-       tristate
- config I2C_ALGOPCF
-       tristate
- config I2C_ALGOPCA
-       tristate
- endif

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Makefile
Simple merge