tree 6d03412fc9315dd1bd221ee1ab4e5f67768a9904
parent 6fc79d40d30b1595261607a155f039fb7b2d5606
parent 9e973e64ac6dc504e6447d52193d4fff1a670156
author Linus Torvalds <torvalds@linux-foundation.org> 1235673395 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235673395 -0800

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