tree bfc974a8a6cab301fd4b99cd61923c2ec3fa775f
parent c3bf4906fba0d8871572b3f50fc036aade093e4d
parent 404e4b43fdd6daa7b4a9f81bc7e4358281d763fa
author Linus Torvalds <torvalds@linux-foundation.org> 1262205559 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262205559 -0800

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

* 'for-linus' of git://neil.brown.name/md:
  md: allow a resync that is waiting for other resync to complete, to be aborted.
  md: remove unnecessary code from do_md_run
  md: make recovery started by do_md_run() visible via sync_action
  md: fix small irregularity with start_ro module parameter
  md: Fix unfortunate interaction with evms