Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2011 16:36:35 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Mar 2011 16:36:35 +0000 (09:36 -0700)
commit3961cdf85b749f6bab50ad31ee97e9277e7a3b70
tree830ddec331de404b57d3bbd71f7a1998025c41f9
parentd39dd11c3e6a7af5c20bfac40594db36cf270f42
parentad3d9d7ede04a9c71be7a9fe1a23961817f371f7
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: fix issue with calling blk_stop_queue() from the request_fn handler
  block: fix bug with inserting flush requests as sort/merge