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

2013-08-27 Thread 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 c

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

2013-08-26 Thread Stephen Rothwell
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()"