Merge tag 'md-3.5-fixes' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jun 2012 16:49:28 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jun 2012 16:49:28 +0000 (09:49 -0700)
Pull two md fixes from NeilBrown:
 "One sparse-warning fix, one bugfix for 3.4-stable"

* tag 'md-3.5-fixes' of git://neil.brown.name/md:
  md: raid1/raid10: fix problem with merge_bvec_fn
  lib/raid6: fix sparse warnings in recovery functions


Trivial merge