From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Dec 2014 21:36:57 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-next
X-Git-Tag: firefly_0821_release~176^2~2682
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d22286ff757586f3cdbd70ded88b98250285ec5;p=firefly-linux-kernel-4.4.55.git

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

Pull aio updates from Benjamin LaHaise.

* git://git.kvack.org/~bcrl/aio-next:
  aio: Skip timer for io_getevents if timeout=0
  aio: Make it possible to remap aio ring
---

7d22286ff757586f3cdbd70ded88b98250285ec5