Merge 3.12-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2013 00:28:16 +0000 (17:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Oct 2013 00:28:16 +0000 (17:28 -0700)
commit97a7729a5c2f01faa076f38a7ec010961b456823
treed1aaecf81d1357b5920579347e6bb894b4bfe11c
parent9987f76ad286887978803ece6cdcf34582279a29
parentd0e639c9e06d44e713170031fe05fb60ebe680af
Merge 3.12-rc4 into tty-next

We want the tty fixes in this branch as well.

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