From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Mar 2009 17:08:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc;p=linux-2.6-omap-h63xx.git

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
---

81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc