[lkml]   [2015]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the clk tree with the imx-mxs tree
Hello Stephen,

Thank you very much for this fix.



On 2015/5/29 18:45, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
> drivers into drivers/clk") from the imx-mxs tree and commit
> b1691707eccd ("clk: hi6220: Clock driver support for Hisilicon hi6220
> SoC") from the clk tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

 \ /
  Last update: 2015-05-29 15:01    [W:0.043 / U:0.016 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site