From: Rafael J. Wysocki Date: Wed, 11 Jul 2012 21:05:06 +0000 (+0200) Subject: Merge branch 'renesas-board-common' into renesas-board X-Git-Tag: v3.6-rc1~63^2~1^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8533bae35becc0b18dc5a6c59ead36dee57cfb47;p=pandora-kernel.git 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 --- 8533bae35becc0b18dc5a6c59ead36dee57cfb47 Reading git-diff-tree failed