Messages in this thread | | | Date | Thu, 4 Apr 2013 16:18:06 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the imx-mxs tree with the pm tree |
| |
Hi Shawn,
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |