From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Jul 2013 19:32:30 +0000 (-0700)
Subject: Merge 3.11-rc3 into tty-next
X-Git-Tag: firefly_0821_release~176^2~5470^2~112
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf204a1b54a5fa34d64676313a1cb0119657388d;p=firefly-linux-kernel-4.4.55.git

Merge 3.11-rc3 into tty-next

We want the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cf204a1b54a5fa34d64676313a1cb0119657388d