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