From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Apr 2011 15:01:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5853b4f06f7b9b56f37f457d7923f7b96496074e;p=deliverable%2Flinux.git

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
---

5853b4f06f7b9b56f37f457d7923f7b96496074e