Messages in this thread | | | Date | Mon, 21 Jan 2013 14:46:04 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with Linus' tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty: serial: vt8500: fix return value check in vt8500_serial_probe()") from Linus' tree and commit 12faa35ae5cb ("serial: vt8500: UART uses gated clock rather than 24Mhz reference") from the tty tree.
I fixed it up (I just used the tty tree version - which included the former fix) 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] | |