Merge branch 'renesas-board-common' into renesas-board
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:05:06 +0000 (23:05 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:05:06 +0000 (23:05 +0200)
* 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


Trivial merge