From: Greg Kroah-Hartman Date: Mon, 10 Nov 2014 03:42:04 +0000 (+0900) Subject: Merge 3.18-rc4 into tty-next. X-Git-Tag: v3.19-rc1~79^2~40 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=394e849b83463869e2267ea7acea002366e6fefc;p=users%2Fjedix%2Flinux-maple.git 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 --- 394e849b83463869e2267ea7acea002366e6fefc