tree 58abfec8444741fd3bd403a908be50c4f63d4842
parent 54573c4a073ff510d028f423ed3074573c7d9437
parent 18558cae0272f8fd9647e69d3fec1565a7949865
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1455489364 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1455489364 -0800

Merge 4.5-rc4 into tty-next

We want the fixes in here, and this resolves a merge error in tty_io.c

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