Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/omap-serial.c

diff --cc arch/x86/platform/ce4100/ce4100.c
Simple merge

diff --cc drivers/tty/serial/omap-serial.c
index 4dbbc00c826687a6f12a0e6b5aeee63325df6e57,c34735cf6276e884d55aa7ab1f80b29b90a891f2..d456321c685c3671f519d90fd989f69f018ae66e
--- 1/drivers/tty/serial/omap-serial.c
--- 2/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -148,9 -96,10 +148,9 @@@ struct uart_omap_port 
        unsigned char           msr_saved_flags;
        char                    name[20];
        unsigned long           port_activity;
-       u32                     context_loss_cnt;
+       int                     context_loss_cnt;
        u32                     errata;
        u8                      wakeups_enabled;
 -      unsigned int            irq_pending:1;
  
        int                     DTR_gpio;
        int                     DTR_inverted;

diff --cc drivers/tty/serial/serial_core.c
Simple merge