From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 15 Oct 2012 05:41:27 +0000 (-0700)
Subject: Merge 3.7-rc1 into tty-linus
X-Git-Tag: firefly_0821_release~3680^2~1770^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c362495586e8a3a6487a318fcd82eaf15ffe2142;p=firefly-linux-kernel-4.4.55.git

Merge 3.7-rc1 into tty-linus

This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.

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

c362495586e8a3a6487a318fcd82eaf15ffe2142