linux-next: manual merge of the tip tree with the ttydev tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/termios.h between commit
9d5eecbefea1142a640bb01426fa6e332a5a9e54 ("tty-x86-termios-clean") from
the ttydev tree and commits 69d5ffdaad7b77b97229b55c36afb20e5bebd29e
("x86: convert termios.h to the asm-generic version") and
73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
header files") from the tip tree.

I just used the version from the tip tree as the ttydev changes are
trivial.  Alan, I think you might as well just drop that patch as the tip
tree is rewriting that file completely (converting it to use the
asm-generic version).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature