diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 19:36:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 19:36:35 +0100 |
| commit | babb29b0a33db53704594f63f271ca6c049eddc6 (patch) | |
| tree | 6d03412fc9315dd1bd221ee1ab4e5f67768a9904 /fs/lockd/svclock.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | xen/blkfront: use blk_rq_map_sg to generate ring entries (diff) | |
| download | linux-babb29b0a33db53704594f63f271ca6c049eddc6.tar.xz linux-babb29b0a33db53704594f63f271ca6c049eddc6.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
xen/blkfront: use blk_rq_map_sg to generate ring entries
block: reduce stack footprint of blk_recount_segments()
cciss: shorten 30s timeout on controller reset
block: add documentation for register_blkdev()
block: fix bogus gcc warning for uninitialized var usage
Diffstat (limited to 'fs/lockd/svclock.c')
0 files changed, 0 insertions, 0 deletions