Re: linux-next: manual merge of the regulator tree with the pm tree

[Mark Brown]

On Tue, Aug 27, 2013 at 03:37:54PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the regulator tree got a conflict in
> drivers/cpufreq/cpufreq-cpu0.c between commit f837a9b5ab05 ("cpufreq:
> cpufreq-cpu0: remove device tree parsing for cpu nodes") from the  tree
> and commit 7d748971c0c0 ("cpufreq: cpufreq-cpu0: Use
> devm_regulator_get_optional()") from the regulator tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The resolution looks good to me.

Attachment: signature.asc
Description: Digital signature