From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Dec 2010 17:19:46 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: Ubuntu-5.0.0-8.9~20844
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7f8635cc9e66a26d7280ba680b044fa2f65104af;p=mirror_ubuntu-disco-kernel.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:
  cciss: fix cciss_revalidate panic
  block: max hardware sectors limit wrapper
  block: Deprecate QUEUE_FLAG_CLUSTER and use queue_limits instead
  blk-throttle: Correct the placement of smp_rmb()
  blk-throttle: Trim/adjust slice_end once a bio has been dispatched
  block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
  drbd: fix for spin_lock_irqsave in endio callback
  drbd: don't recvmsg with zero length
---

7f8635cc9e66a26d7280ba680b044fa2f65104af