]> 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)
commit9967f484adb2491ae02cbadcf7142988805f4b5d
tree305449237d969d0476bf66ccf401132f8265c287
parent8bd2c1a118f61b5687a8a4937c2ac5031f104de8
parent9227091aaabe07de1a0df9b93905139b8a7d843f
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