From: James Morris <james.l.morris@oracle.com>
Date: Mon, 14 Apr 2014 01:23:14 +0000 (+1000)
Subject: Merge commit 'v3.14' into next
X-Git-Tag: firefly_0821_release~176^2~2675^2~49
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecd740c6f2f092b90b95fa35f757973589eaaca2;p=firefly-linux-kernel-4.4.55.git

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

ecd740c6f2f092b90b95fa35f757973589eaaca2