On Tue, Oct 08, 2013 at 03:44:15PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the tty-next tree got a conflict in
>
> drivers/tty/serial/imx.c
>
> caused by commits e2c2725 (serial: imx: Use NULL as the last argument of
> add_preferred_console()) and b4e788d (Revert "serial:
Today's linux-next merge of the tty-next tree got a conflict in
drivers/tty/serial/imx.c
caused by commits e2c2725 (serial: imx: Use NULL as the last argument of
add_preferred_console()) and b4e788d (Revert "serial: i.MX: evaluate
linux,stdout-path property").
The former commit only chan
2 matches
Mail list logo