Merge 3.18-rc4 into tty-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:42:04 +0000 (12:42 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Nov 2014 03:42:04 +0000 (12:42 +0900)
commit394e849b83463869e2267ea7acea002366e6fefc
tree917ec5c564964d781ffbda2917efdf7cde252c72
parent98267d33e2da8cd386212856a22f4a64b32834ab
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108
Merge 3.18-rc4 into tty-next.

This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c

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