Merge 4.5-rc2 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Feb 2016 20:53:14 +0000 (12:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Feb 2016 20:53:14 +0000 (12:53 -0800)
We want the tty/serial fixes in here as well to make merges easier.

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

Trivial merge