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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/tty/serial/serial_core.c between commit 7a876b39b5bc ("serial:
cast before shifting on port io") from the tty tree and commit
"drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift" from
the akpm tree.

I fixed it up (using the akpm tree version which included the fix from
the tty tree) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature