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)
commit374916ed16180b8de388699704e827e7740be525
tree5ef81883ac392c0ee57dd53cfdbc64e863844957
parent9e68447f5b38d6092a6feeeb713a6564e963e68b
parentaba336bd1d46d6b0404b06f6915ed76150739057
Merge tag 'md-3.5-fixes' of git://neil.brown.name/md

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