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

[Rob Herring]

On 07/05/2012 11:51 PM, Stephen Rothwell wrote:
> Hi Rob,
> 
> Today's linux-next merge of the dt-rh tree got a conflict in
> Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit
> 348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the
> l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding
> documentation") from the dt-rh tree.
> 
> The former replaced the text (and fixed the typo) fixed by the latter, so
> I used that.

I've dropped the conflicting hunk from that patch.

Rob

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