summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 09:36:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 09:36:35 -0700
commit3961cdf85b749f6bab50ad31ee97e9277e7a3b70 (patch)
tree830ddec331de404b57d3bbd71f7a1998025c41f9 /include/trace
parentd39dd11c3e6a7af5c20bfac40594db36cf270f42 (diff)
parentad3d9d7ede04a9c71be7a9fe1a23961817f371f7 (diff)
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
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions