On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell <[email protected]> wrote:
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> Correct Ux500 family names usage") from the arm-soc tree and commit
> ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
> the clk tree.
>
> The latter removed the file so I did that - there may be more fixup
> required.
This is the correct solution, thanks!
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
