Subject: linux-next: manual merge of the ttydev tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Jul 2008 19:11:34 +1000

Hi Alan,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/char/tty_io.c between commit
3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d ("tty: Fix inverted logic in
send_break") from Linus' tree and "77-tty-break-errorhandler" from the
ttydev tree.

I made the obvious fixup.  Please redo the patch.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/