lkml.org 
[lkml]   [2015]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the l2-mtd tree with the mips tree
From
Date
On Fri, 2015-06-12 at 20:50 +1000, Michael Ellerman wrote:
> Hi Brian,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in MAINTAINERS
> between commit 68c2d21d0126 "MIPS: BCM47xx: Move NVRAM driver to the
> drivers/firmware/" from the mips tree and commit 02787daadbda "MAINTAINERS: add
> entry for new brcmnand/ directory" from the l2-mtd tree.

Gah sorry, sent this twice. Ignore this one.

cheers




\
 
 \ /
  Last update: 2015-06-12 13:21    [W:0.293 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site