Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Mar 2006 00:24:24 +0000 (16:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Mar 2006 00:24:24 +0000 (16:24 -0800)
commitcec6062037783a762aa5606b06b8bc5c14d9657f
treec862659eb55e44314f6d524f5479204994b91901
parent88f07ffb63add018bfafd480ec6a294088277f06
parent2056a782f8e7e65fd4bfd027506b4ce1c5e9ccd4
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23
  [PATCH] relay: consolidate sendfile() and read() code
  [PATCH] relay: add sendfile() support
  [PATCH] relay: migrate from relayfs to a generic relay API