tree 487b3ceb33b2903fa03ead519a8459d994f77dc4
parent 7adfff587bc4d9ed8f85a31b12464513fda886a2
parent d1b9432712a25eeb06114fb4b587133525a47de5
author Linus Torvalds <torvalds@linux-foundation.org> 1386347579 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1386347579 -0800

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

Pull aio fix from Benjamin LaHaise:
 "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
  trinity"

* git://git.kvack.org/~bcrl/aio-next:
  aio: clean up aio ring in the fail path