]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commitcdecbb336e64b8a846bf97c5a275dc94fdb1083d
tree305449237d969d0476bf66ccf401132f8265c287
parent4e02370f64167a30ff7ba35ae5bc296f09b964d3
parent9c9ce763b114e608b5cf3aa6cb69ad9f6e8b6adf
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