tree 2978295a4805983afe16dbf1372a4ff679026d2d
parent e0a2af1e60ae89b18ef3afbf655f096564751045
parent c148ffdcda00b6599b70f8b65e6a1fadd1dbb127
author Linus Torvalds <torvalds@linux-foundation.org> 1258232372 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258232372 -0800

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

* 'for-linus' of git://neil.brown.name/md:
  md/raid5: Allow dirty-degraded arrays to be assembled when only party is degraded.
  Don't unconditionally set in_sync on newly added device in raid5_reshape
  md: allow v0.91 metadata to record devices as being active but not in-sync.
  md: factor out updating of 'recovery_offset'.