From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 6 Dec 2014 16:17:24 +0000 (-0800)
Subject: Merge 3.18-rc7 into tty-next
X-Git-Tag: firefly_0821_release~176^2~2678^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dd63af108f0814f0b589659f4e55a7a5af3b7e53;p=firefly-linux-kernel-4.4.55.git

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>
---

dd63af108f0814f0b589659f4e55a7a5af3b7e53