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

Browse source

* 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

...

This commit is contained in:

Rafael J. Wysocki 2012-07-11 23:05:06 +02:00

parent 9d0db7abbd 34767f8dcc

commit 8533bae35b

3 changed files with 31 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

arch/arm/mach-shmobile/Kconfig

View file

19

drivers/regulator/fixed-helper.c

View file

11

include/linux/regulator/fixed.h

View file