From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jun 2013 22:17:53 +0000 (-0700)
Subject: Merge 3.10-rc7 into tty-next
X-Git-Tag: firefly_0821_release~176^2~5846^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=805bf3daf361a501594f8b27b394a8d7372ebe3c;p=firefly-linux-kernel-4.4.55.git

Merge 3.10-rc7 into tty-next

We want the tty fixes in this branch as well.

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

805bf3daf361a501594f8b27b394a8d7372ebe3c