tree 8cf850e91b26af25071f00055fa89fb924796de6
parent a970f5d513163a305d46f330d0a7d2dd4c4506f1
parent f6603783f9f099bf7a83b3f6c689bbbf74f0e96e
author Linus Torvalds <torvalds@linux-foundation.org> 1302879673 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302879673 -0700

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