From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 19 Oct 2013 20:02:47 +0000 (-0700)
Subject: Merge 3.12-rc6 into char-misc-next
X-Git-Tag: firefly_0821_release~176^2~5060^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dfc568e6bc08916f1035af456e4631c47166b5cf;p=firefly-linux-kernel-4.4.55.git

Merge 3.12-rc6 into char-misc-next

We want the fixes in here as well.

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

dfc568e6bc08916f1035af456e4631c47166b5cf