projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98267d3 206c5f6)
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)
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/tty/n_tty.c patch | diff1 | diff2 | blob | history
drivers/tty/serial/of_serial.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/tty/n_tty.c
Simple merge
diff --cc drivers/tty/serial/of_serial.c
Simple merge