Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git

diff --combined arch/arm/Kconfig
index c65c6eb9810d84b05267470cadfbf2efc9b0e682,0a7700ae8deecfbada6852969f22169bf77491ae..e85097bceff41fa1a41cb715f0bca91ceb3a23ab
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -310,7 -310,7 +310,7 @@@ menu "Kernel Features
  
  config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL #&& n
 +      depends on EXPERIMENTAL && BROKEN #&& n
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@@ -752,6 -752,8 +752,8 @@@ source "drivers/hwmon/Kconfig
  
  source "drivers/misc/Kconfig"
  
+ source "drivers/mfd/Kconfig"
+ 
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"