Merge 3.17-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2014 05:17:40 +0000 (22:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2014 05:17:40 +0000 (22:17 -0700)
commit882ebfc28c389be86535bda4a7d9e407020356bf
treee8f3ddeda13196f40040f3ba4701ece5d38c63cc
parent1c84cd48a117486166f3597c081b170b76e5bd81
parent9e82bf014195d6f0054982c463575cdce24292be
Merge 3.17-rc5 into tty-next

We want those fixes in here as well.

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