]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Merge commit '3288b419b988b20a53a2b12eb8e5f9f536228db4'; commit '4363fd80bcc9f85ed824...
authorNeilBrown <neilb@suse.de>
Mon, 31 May 2010 01:34:14 +0000 (11:34 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 31 May 2010 01:34:14 +0000 (11:34 +1000)
* commit '3288b419b988b20a53a2b12eb8e5f9f536228db4':
  Revert "Incremental: honor --no-degraded to delay assembly"
  Incremental: honor an 'enough' flag from external handlers

* commit '4363fd80bcc9f85ed824228dee5e6350a8d73e18':
  imsm: robustify recovery-start detection
  fix: memory leak in mdmon_pid()

* commit '63b4aae33ebf00d443378daf313622630f2336c0':
  mdmon: fix missing open of md/<dev>/recovery_start

1  2  3 
super-intel.c

diff --cc super-intel.c
Simple merge