Merge 3.4-rc4 into tty-next

This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c

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

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
index c2816f4948070157f1c969898bfde97b58bd6841,a5e63438584f76d820af90185a5c7335f1a04681..4fdec6a6b7580822462f8d6429399c78e1403ccc
--- 1/drivers/tty/serial/pch_uart.c
--- 2/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -1447,11 -1455,8 +1455,10 @@@ static int pch_uart_verify_port(struct 
                        __func__);
                return -EOPNOTSUPP;
  #endif
-               priv->use_dma_flag = 1;
 -              priv->use_dma = 1;
                dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
 +              if (!priv->use_dma)
 +                      pch_request_dma(port);
 +              priv->use_dma = 1;
        }
  
        return 0;