]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kvack.org/~bcrl/aio-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2015 02:27:58 +0000 (18:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2015 02:27:58 +0000 (18:27 -0800)
commitbb4d003ea3811fa91df7d04572e928682a100e93
tree305449237d969d0476bf66ccf401132f8265c287
parent0ac2bd3f2dd304c2dea9c16c19e3840474b17813
parent18287e37c76e92d7b0be8274bbbadc1892622dec
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