From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Oct 2012 16:00:57 +0000 (-0700)
Subject: Merge 3.7-rc3 into tty-next
X-Git-Tag: firefly_0821_release~3680^2~1518^2~85
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca364d8388602b5c0d607c5452774833cc1ad667;p=firefly-linux-kernel-4.4.55.git

Merge 3.7-rc3 into tty-next

This merges the tty changes in 3.7-rc3 into tty-next

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

ca364d8388602b5c0d607c5452774833cc1ad667