lkml.org 
[lkml]   [2012]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the clk tree with the arm-soc tree
From
On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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


\
 
 \ /
  Last update: 2012-09-10 18:02    [W:0.075 / U:0.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site