Coexistence and competition between superconductivity and magnetism in La2-xSrxCu0.94M0.06O4 (M=Mn and Ru)