On Thursday, May 01, 2014 12:09:32 PM Stephen Rothwell wrote:
>
> --Signature=_Thu__1_May_2014_12_09_32_+1000_d7zY1SkU6vg6nEQn
> Content-Type: text/plain; charset=US-ASCII
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45
> ("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree
> and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry
> macro for iteration") from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks!
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
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
