From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 00:31:36 +0000 (-0700)
Subject: Merge 3.6-rc6 into tty-next
X-Git-Tag: firefly_0821_release~3680^2~1976^2~39
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5;p=firefly-linux-kernel-4.4.55.git

Merge 3.6-rc6 into tty-next

This pulls in the fixes in 3.6-rc6

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

7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5