Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Apr 2011 17:33:41 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Apr 2011 17:33:41 +0000 (10:33 -0700)
commitd733ed6c34be3aef0517a04e4103eed6b369ec50
treeb49723304c48c2f877b9cb284a4b39361934c670
parent08150c533c57981054324b9e87dbf686006d890f
parent49cac01e1fa74174d72adb0e872504a7fefd7c01
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