Merge 4.11-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Apr 2017 07:07:37 +0000 (09:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Apr 2017 07:07:37 +0000 (09:07 +0200)
We want the tty patch revert in here to handle merges and future work
properly.

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

diff --cc MAINTAINERS
Simple merge