From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 24 Mar 2006 00:24:24 +0000 (-0800)
Subject: Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc1~995
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec6062037783a762aa5606b06b8bc5c14d9657f;p=linux-2.6

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
---

cec6062037783a762aa5606b06b8bc5c14d9657f