Merge 4.6-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:39:13 +0000 (09:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:39:13 +0000 (09:39 +0200)
commit10ee08292028d3d22d201a34ba7d24a085818cb3
treecf3bff48a7eab154574355f00a4b4f27dc85ff11
parent7da4b8b7378790dd1e4af1bb7522863127fa1438
parent44549e8f5eea4e0a41b487b63e616cb089922b99
Merge 4.6-rc7 into tty-next

We want the pty fixes in here as well so that patches can build on it.

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