lkml.org 
[lkml]   [2013]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the renesas tree with the arm-soc tree
On Mon, Dec 16, 2013 at 11:00:54AM +0100, Nicolas Ferre wrote:
> On 16/12/2013 00:47, Stephen Rothwell :
> > Hi Simon,
> >
> > Today's linux-next merge of the renesas tree got a conflict in
> > drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> > base support") from the arm-soc tree and commit 10cdfe9f327a ("clk:
> > shmobile: Add R-Car Gen2 clocks support") from the renesas tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Fine for me.

Likewise. Thanks Stephen.


\
 
 \ /
  Last update: 2013-12-17 01:41    [W:0.153 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site