From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Nov 2013 16:42:14 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0f278c1dd0175093ed37ce132395dc689e6987e;p=openwrt%2Fstaging%2Fblogic.git

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

d0f278c1dd0175093ed37ce132395dc689e6987e