From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Oct 2013 00:28:16 +0000 (-0700)
Subject: Merge 3.12-rc4 into tty-next
X-Git-Tag: firefly_0821_release~176^2~5058^2~44
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97a7729a5c2f01faa076f38a7ec010961b456823;p=firefly-linux-kernel-4.4.55.git

Merge 3.12-rc4 into tty-next

We want the tty fixes in this branch as well.

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

97a7729a5c2f01faa076f38a7ec010961b456823