Merge branch 'renesas-board-common' into renesas-board

* renesas-board-common:
  ARM: mach-shmobile: select the fixed regulator driver on several boards
  regulator: extend the fixed dummy voltage regulator to accept voltage
  regulator: support multiple dummy fixed regulators

Conflicts:
	arch/arm/mach-shmobile/Kconfig

diff --cc arch/arm/mach-shmobile/Kconfig
index 379cefd,8854019..0168382
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -123,7 -131,7 +132,8 @@@ config MACH_KZM9
        depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
        select USE_OF
 +      select SND_SOC_AK4642 if SND_SIMPLE_CARD
+       select REGULATOR_FIXED_VOLTAGE if REGULATOR
  
  comment "SH-Mobile System Configuration"