diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 17:01:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-15 17:01:13 +0200 |
| commit | 5853b4f06f7b9b56f37f457d7923f7b96496074e (patch) | |
| tree | 8cf850e91b26af25071f00055fa89fb924796de6 /fs/9p | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 (diff) | |
| parent | block: only force kblockd unplugging from the schedule() path (diff) | |
| download | linux-5853b4f06f7b9b56f37f457d7923f7b96496074e.tar.xz linux-5853b4f06f7b9b56f37f457d7923f7b96496074e.zip | |
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: only force kblockd unplugging from the schedule() path
block: cleanup the block plug helper functions
block, blk-sysfs: Use the variable directly instead of a function call
block: move queue run on unplug to kblockd
block: kill queue_sync_plugs()
block: readd plug trace event
block: add callback function for unplug notification
block: add comment on why we save and disable interrupts in flush_plug_list()
block: fixup block IO unplug trace call
block: remove block_unplug_timer() trace point
block: splice plug list to local context
Diffstat (limited to 'fs/9p')
0 files changed, 0 insertions, 0 deletions