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

2014-05-27 Thread 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/s

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

2014-05-26 Thread Stephen Rothwell
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