Merge git://git.kvack.org/~bcrl/aio-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:42:14 +0000 (08:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:42:14 +0000 (08:42 -0800)
commitd0f278c1dd0175093ed37ce132395dc689e6987e
treec2a555e704cb71d56611c9ef7be03089d1ec03f4
parent533db9b3d4e1a0405161e66f4da66baf5863b863
parentddb8c45ba15149ebd41d7586261c05f7ca37f9a1
Merge git://git.kvack.org/~bcrl/aio-next

Pull aio fixes from Benjamin LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: nullify aio->ring_pages after freeing it
  aio: prevent double free in ioctx_alloc
  aio: Fix a trinity splat
fs/aio.c