Merge 4.7-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Jul 2016 15:17:08 +0000 (08:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Jul 2016 15:17:08 +0000 (08:17 -0700)
We want the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/tty/vt/vt.c

diff --cc MAINTAINERS
Simple merge
Simple merge