git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 98267d3 206c5f6)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Nov 2014 03:42:04 +0000 (12:42 +0900)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Nov 2014 03:42:04 +0000 (12:42 +0900)
commit	394e849b83463869e2267ea7acea002366e6fefc
tree	917ec5c564964d781ffbda2917efdf7cde252c72	tree \| snapshot
parent	98267d33e2da8cd386212856a22f4a64b32834ab	commit \| diff
parent	206c5f60a3d902bc4b56dab2de3e88de5eb06108	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/tty/n_tty.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/of_serial.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.