]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:19:46 +0000 (09:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:19:46 +0000 (09:19 -0800)
* '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

1  2 
drivers/md/md.c
drivers/scsi/scsi_lib.c

diff --cc drivers/md/md.c
Simple merge
Simple merge