diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-08 18:27:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-08 18:27:58 -0800 |
commit | cdecbb336e64b8a846bf97c5a275dc94fdb1083d (patch) | |
tree | 305449237d969d0476bf66ccf401132f8265c287 /Makefile | |
parent | Merge tag 'trace-fixes-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
parent | aio: annotate aio_read_event_ring for sleep patterns (diff) | |
download | linux-dev-cdecbb336e64b8a846bf97c5a275dc94fdb1083d.tar.xz linux-dev-cdecbb336e64b8a846bf97c5a275dc94fdb1083d.zip |
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions