Merge 3.16-rc5 into tty-next.

We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc arch/arm/boot/dts/exynos4.dtsi
Simple merge

diff --cc drivers/tty/serial/arc_uart.c
index f8dc7d3,008c223..a59d1d7
--- 1/drivers/tty/serial/arc_uart.c
--- 2/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@@ -166,18 -172,18 +166,18 @@@ static void arc_serial_tx_chars(struct 
        int sent = 0;
        unsigned char ch;
  
 -      if (unlikely(uart->port.x_char)) {
 -              UART_SET_DATA(uart, uart->port.x_char);
 -              uart->port.icount.tx++;
 -              uart->port.x_char = 0;
 +      if (unlikely(port->x_char)) {
 +              UART_SET_DATA(port, port->x_char);
 +              port->icount.tx++;
 +              port->x_char = 0;
                sent = 1;
-       } else if (xmit->tail != xmit->head) {  /* TODO: uart_circ_empty */
+       } else if (!uart_circ_empty(xmit)) {
                ch = xmit->buf[xmit->tail];
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
 -              uart->port.icount.tx++;
 -              while (!(UART_GET_STATUS(uart) & TXEMPTY))
 +              port->icount.tx++;
 +              while (!(UART_GET_STATUS(port) & TXEMPTY))
                        cpu_relax();
 -              UART_SET_DATA(uart, ch);
 +              UART_SET_DATA(port, ch);
                sent = 1;
        }
  

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