Merge commit 'refs/next/20111214/regmap'

Conflicts:
	drivers/base/regmap/regcache.c
	drivers/base/regmap/regmap.c

diff --cc drivers/gpio/Kconfig
index 79199f404b74f778c636bfc03a933c795077e0fc,8482a23887dc4e8a64f12783fad08c658d8b1ddb..e3380137b05b07107a9a62357cd7af1e8301a9ce
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -70,7 -70,7 +70,7 @@@ config GPIO_GENERI
  
  config GPIO_DA9052
        tristate "Dialog DA9052 GPIO"
--      depends on PMIC_DA9052
++      depends on PMIC_DA9052 && BROKEN
        help
          Say yes here to enable the GPIO driver for the DA9052 chip.