Merge 4.11-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Apr 2017 12:18:16 +0000 (14:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Apr 2017 12:18:16 +0000 (14:18 +0200)
We want the serial fixes in here as well to handle merge issues.

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

diff --cc MAINTAINERS
Simple merge
Simple merge