]> err.no Git - linux-2.6/commitdiff
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 9 Jul 2006 22:49:36 +0000 (15:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 9 Jul 2006 22:49:36 +0000 (15:49 -0700)
* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Only the first two bits in bio->bi_rw and rq->flags match
  [PATCH] blktrace: readahead support
  [PATCH] blktrace: fix barrier vs sync typo


Trivial merge