git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d0db7a
34767f8
)
Merge branch 'renesas-board-common' into renesas-board
author
Rafael J. Wysocki
<rjw@sisk.pl>
Wed, 11 Jul 2012 21:05:06 +0000
(23:05 +0200)
committer
Rafael 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