diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 15:49:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 15:49:36 -0700 |
commit | 84e74f6b770efe7c9beb604118695aa311b969f5 (patch) | |
tree | a242b29d44b85e510481232b09b2371572570ff8 /drivers/net/e1000/e1000_main.c | |
parent | 953969ddf5b049361ed1e8471cc43dc4134d2a6f (diff) | |
parent | 1959d21232931dfa686769a21161413f10d6652f (diff) | |
download | talos-obmc-linux-84e74f6b770efe7c9beb604118695aa311b969f5.tar.gz talos-obmc-linux-84e74f6b770efe7c9beb604118695aa311b969f5.zip |
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
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
0 files changed, 0 insertions, 0 deletions