lkml.org 
[lkml]   [2014]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the clk tree with Linus' tree
On 29/01/2014 04:25, Stephen Rothwell :
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
> Makefile") from the clk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Your fix is correct. Thanks Stephen.

Best regards,
--
Nicolas Ferre


\
 
 \ /
  Last update: 2014-01-29 10:21    [W:0.032 / U:2.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site