From: James Morris <james.l.morris@oracle.com>
Date: Tue, 24 Jun 2014 08:46:07 +0000 (+1000)
Subject: Merge commit 'v3.15' into next
X-Git-Tag: firefly_0821_release~176^2~2675^2~44
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f01387d2693813eb5271a3448e6a082322c7d75d;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v3.15' into next
---

f01387d2693813eb5271a3448e6a082322c7d75d