Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block

Browse source

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

...

This commit is contained in:

Linus Torvalds 2006-03-23 16:24:24 -08:00

parent 88f07ffb63 2056a782f8

commit cec6062037

29 changed files with 2221 additions and 1293 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/blkdev.h

View file

277

include/linux/blktrace_api.h

View file

4

include/linux/compat_ioctl.h

View file

4

include/linux/fs.h

View file

281

include/linux/relay.h

View file

1

include/linux/sched.h

View file