Merge git://git.kvack.org/~bcrl/aio-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 02:55:44 +0000 (18:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 02:55:44 +0000 (18:55 -0800)
commit277f850fbc4a0c732311af2b9a2d28d29a3c5582
tree49edadbb3dc04d62117b7ceeb6018e5ac8df0596
parentd1ca00078071cb6c45f15ab589682182cb5e628e
parent835f252c6debd204fcd607c79975089b1ecd3472
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
fs/aio.c