diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:05:06 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:05:06 +0200 |
| commit | 8533bae35becc0b18dc5a6c59ead36dee57cfb47 (patch) | |
| tree | 6bdebf2d2a4216829093bf2eda704f30bf8f0879 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | 9d0db7abbdebc90150f3b98e9bc76626eaf01bd3 (diff) | |
| parent | 34767f8dccc326026f97cd63f759dd36bd83502d (diff) | |
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
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
0 files changed, 0 insertions, 0 deletions