From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Oct 2010 16:49:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.36~23
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=264780c29041a147f5cff5dda64d03373e24b972

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  ubd: fix incorrect sector handling during request restart
  ps3disk: passing wrong variable to bvec_kunmap_irq()
---

264780c29041a147f5cff5dda64d03373e24b972