]> git.ipfire.org Git - thirdparty/mdadm.git/commit
Merge branch 'master' into devel-3.2
authorNeilBrown <neilb@suse.de>
Tue, 15 Mar 2011 04:35:04 +0000 (15:35 +1100)
committerNeilBrown <neilb@suse.de>
Tue, 15 Mar 2011 04:35:04 +0000 (15:35 +1100)
commit88b496c2697ed531ffecf2f8ced76f437297e5fe
tree59eaa8dc9f7fd06f8bf54191c0c790e332c02768
parente26c926209d84683815275bf8a3850b00731937e
parent666bba9b5011150ff01de421dd44b06c0a6610a5
Merge branch 'master' into devel-3.2

Conflicts:
Manage.c
managemon.c
super-ddf.c
super-intel.c
Manage.c
managemon.c
mdadm.8.in
super-ddf.c