Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:49:16 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:49:16 +0000 (09:49 -0700)
commit264780c29041a147f5cff5dda64d03373e24b972
tree4d74502d311792550f052e54a5e93ded5de5283e
parent8fd01d6cfbf75465d84a4e533ed70c5f57b3ff51
parent47526903feb52f4c26a6350370bdf74e337fcdb1
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()