]> Pileus Git - ~andy/linux/commit
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)
commit8533bae35becc0b18dc5a6c59ead36dee57cfb47
tree6bdebf2d2a4216829093bf2eda704f30bf8f0879
parent9d0db7abbdebc90150f3b98e9bc76626eaf01bd3
parent34767f8dccc326026f97cd63f759dd36bd83502d
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
arch/arm/mach-shmobile/Kconfig