From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Nov 2014 02:55:44 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-fixes
X-Git-Tag: v3.18-rc7~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=277f850fbc4a0c732311af2b9a2d28d29a3c5582;p=~emulex%2Finfiniband.git

Merge git://git.kvack.org/~bcrl/aio-fixes

Pull aio fix from Ben LaHaise:
 "Dirty page accounting fix for aio"

* git://git.kvack.org/~bcrl/aio-fixes:
  aio: fix uncorrent dirty pages accouting when truncating AIO ring buffer
---

277f850fbc4a0c732311af2b9a2d28d29a3c5582