Merge 3.14-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 23:56:45 +0000 (15:56 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 23:56:45 +0000 (15:56 -0800)
commit8301bb240d0f1b1521b83342f3af8edab7131361
treeb866e77863d534d2447f4aaeeba77ea6b307e2bd
parent12f287878afc39acea00b3e62baf72c79878c427
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691
Merge 3.14-rc4 into tty-next

We want the tty revert here as well.

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