From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Nov 2014 03:42:04 +0000 (+0900)
Subject: Merge 3.18-rc4 into tty-next.
X-Git-Tag: firefly_0821_release~176^2~2678^2~40
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=394e849b83463869e2267ea7acea002366e6fefc;p=firefly-linux-kernel-4.4.55.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 <gregkh@linuxfoundation.org>
---

394e849b83463869e2267ea7acea002366e6fefc