From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Dec 2013 16:32:59 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: v3.13-rc3~2
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=c537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c

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
---

c537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c