summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250/8250_mtk.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-12-06 17:17:24 +0100
committerGreg Kroah-Hartman2014-12-06 17:17:24 +0100
commitdd63af108f0814f0b589659f4e55a7a5af3b7e53 (patch)
tree0a7679fecb5b516cddb2153c632a4262899be6c3 /drivers/tty/serial/8250/8250_mtk.c
parentserial: pxa: hold port.lock when reporting modem line changes (diff)
parentLinux 3.18-rc7 (diff)
downloadkernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.gz
kernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.xz
kernel-qcow2-linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.zip
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_mtk.c')
0 files changed, 0 insertions, 0 deletions