Merge branch 'for-linus' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Nov 2011 02:33:53 +0000 (18:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Nov 2011 02:33:53 +0000 (18:33 -0800)
commited72a3d1b4acb8ace77a1049fbbcbc7edb035267
tree20c228d41a9d73a8949858dc915a7a21878cc5a4
parentc8c27c955ac633c0d783ec65f65176c82809f04d
parent257a4b42af7586fab4eaec7f04e6896b86551843
Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md/raid5: STRIPE_ACTIVE has lock semantics, add barriers
  md/raid5: abort any pending parity operations when array fails.