From: Benjamin LaHaise <bcrl@kvack.org>
Date: Mon, 14 Jul 2014 17:14:27 +0000 (-0400)
Subject: Merge ../aio-fixes
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~50^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e830d53717cf3d5c30c1afce3773ef97e436cd9;p=pandora-kernel.git

Merge ../aio-fixes
---

6e830d53717cf3d5c30c1afce3773ef97e436cd9
Reading git-diff-tree failed