Re: linux-next: manual merge of the tty tree with the m68k tree

[Greg KH]

On Tue, May 27, 2014 at 04:53:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> Documentation/kernel-parameters.txt between commit d5ebf7cc86a7 ("m68k:
> Multi-platform EARLY_PRINTK") from the m68k tree and commit
> 0d3c673e7881 ("tty/serial: pl011: add generic earlycon support") from
> the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).  Thanks Geert for the heads up.

Looks good, thanks.

greg k-h
--
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/