Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: make unplug timer trace event correspond to the schedule() unplug block: let io_schedule() flush the plug inline
No related branches found
No related tags found
Showing
- block/blk-core.c 12 additions, 6 deletionsblock/blk-core.c
- include/linux/blkdev.h 13 additions, 0 deletionsinclude/linux/blkdev.h
- include/trace/events/block.h 7 additions, 6 deletionsinclude/trace/events/block.h
- kernel/sched.c 1 addition, 1 deletionkernel/sched.c
- kernel/trace/blktrace.c 12 additions, 6 deletionskernel/trace/blktrace.c
Loading
Please register or sign in to comment