Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:08:57 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:08:57 +0000 (10:08 -0700)
commit81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc
treea49ceefa240013fc1a91d7e3f4c308b51232972f
parentd3dea1e2d5b08964a8d47a29b4f6807a60d40f4c
parent59247eaea50cc68cc6ce3d3fd3855f3301b65c96
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: fix missing bio back/front segment size setting in blk_recount_segments()
  loop: don't increment p->offset with (size_t) -EINVAL
  cciss: remove 30 second initial timeout on controller reset
  Fix kernel NULL pointer dereference in xen-blkfront