From: Benjamin LaHaise <bcrl@kvack.org>
Date: Mon, 14 Jul 2014 17:14:27 +0000 (-0400)
Subject: Merge ../aio-fixes
X-Git-Tag: firefly_0821_release~176^2~3375^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6e830d53717cf3d5c30c1afce3773ef97e436cd9;p=firefly-linux-kernel-4.4.55.git

Merge ../aio-fixes
---

6e830d53717cf3d5c30c1afce3773ef97e436cd9