From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 May 2012 16:44:35 +0000 (-0700)
Subject: Merge tag 'md-3.4-fixes' of git://neil.brown.name/md
X-Git-Tag: Ubuntu-5.0.0-8.9~16119
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36a1987cd891fa82d9981886c3abbbe82c428c0d;p=mirror_ubuntu-disco-kernel.git

Merge tag 'md-3.4-fixes' of git://neil.brown.name/md

Pull two md fixes from NeilBrown:
 "One fixes a bug in the new raid10 resize code so is relevant to 3.4
  only.

  The other fixes a bug in the use of md by dm-raid, so is relevant to
  any kernel with dm-raid support"

* tag 'md-3.4-fixes' of git://neil.brown.name/md:
  MD: Add del_timer_sync to mddev_suspend (fix nasty panic)
  md/raid10: set dev_sectors properly when resizing devices in array.
---

36a1987cd891fa82d9981886c3abbbe82c428c0d