| commit | 81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 08 10:08:57 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 08 10:08:57 2009 -0700 |
| tree | a49ceefa240013fc1a91d7e3f4c308b51232972f | |
| parent | d3dea1e2d5b08964a8d47a29b4f6807a60d40f4c [diff] | |
| parent | 59247eaea50cc68cc6ce3d3fd3855f3301b65c96 [diff] |
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