From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jun 2009 15:41:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://neil.brown.name/md
X-Git-Tag: v2.6.30~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d11eff66889e65e9351111b1cc39f066f9f9729;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md/raid5: fix bug in reshape code when chunk_size decreases.
  md/raid5 - avoid deadlocks in get_active_stripe during reshape
  md/raid5: use conf->raid_disks in preference to mddev->raid_disk
---

4d11eff66889e65e9351111b1cc39f066f9f9729