tree c2a555e704cb71d56611c9ef7be03089d1ec03f4
parent 533db9b3d4e1a0405161e66f4da66baf5863b863
parent ddb8c45ba15149ebd41d7586261c05f7ca37f9a1
author Linus Torvalds <torvalds@linux-foundation.org> 1385138534 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1385138534 -0800

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