On 4 April 2013 10:48, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/mach-imx/cpufreq.c between commits b43a7ffbf33b ("cpufreq:
> Notify all policy->cpus in cpufreq_notify_transition()") and eb2f50ff93f0
> ("cpufreq: drivers: Remove unnecessary assignments of policy-> members")
> from the pm tree and commit 180cb7d6ab8c ("ARM: imx: Remove cpufreq
> driver") from the imx-mxs tree.
>
> The latter removed the file, so I just did that and can carry the fix as
> necessary (no action is required).
Thanks. Looks correct.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
