From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Apr 2011 17:33:41 +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=d733ed6c34be3aef0517a04e4103eed6b369ec50;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: make unplug timer trace event correspond to the schedule() unplug
  block: let io_schedule() flush the plug inline
---

d733ed6c34be3aef0517a04e4103eed6b369ec50