Merge git://git.kvack.org/~bcrl/aio-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2014 23:08:55 +0000 (16:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2014 23:08:55 +0000 (16:08 -0700)
Pull aio bugfixes from Ben LaHaise:
 "Two small fixes"

* git://git.kvack.org/~bcrl/aio-fixes:
  aio: block exit_aio() until all context requests are completed
  aio: add missing smp_rmb() in read_events_ring


Trivial merge