From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Feb 2015 02:27:58 +0000 (-0800)
Subject: Merge git://git.kvack.org/~bcrl/aio-fixes
X-Git-Tag: v3.19~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cdecbb336e64b8a846bf97c5a275dc94fdb1083d;p=~emulex%2Finfiniband.git

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

Pull aio nested sleep annotation from Ben LaHaise,

* git://git.kvack.org/~bcrl/aio-fixes:
  aio: annotate aio_read_event_ring for sleep patterns
---

cdecbb336e64b8a846bf97c5a275dc94fdb1083d