Re: linux-next: manual merge of the l2-mtd tree with the mips tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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


--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux