Messages in this thread | | | Date | Tue, 6 Nov 2012 14:53:32 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the arm tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL: omap: remove setting of EFR SCD bit") from the arm tree and commit 7ba897d77ce2 ("serial: omap: Remove the default setting of special character") from the tty tree.
I fixed it up (using the version from the arm tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |