Merge 3.11-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2013 21:41:03 +0000 (05:41 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2013 21:41:03 +0000 (05:41 +0800)
commit5ac1ccb70a3b7d4627c257fcbb2579b2dc4d2a0a
tree57c9fc4aae86d6dc4dacb921e673ac6b0deac26d
parenta4f2dc9efc00a56ca30ce340a1405293ec9488a4
parentc095ba7224d8edc71dcef0d655911399a8bd4a3f
Merge 3.11-rc4 into tty-next

We want the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/arc_uart.c
drivers/tty/serial/mxs-auart.c