]> git.ipfire.org Git - thirdparty/mdadm.git/commit
Merge branch 'master' into devel-3.2
authorNeilBrown <neilb@suse.de>
Thu, 24 Mar 2011 01:00:55 +0000 (12:00 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 24 Mar 2011 01:00:55 +0000 (12:00 +1100)
commit51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a
tree6f6afb83f9466acdab298de5ea276ac6475ef543
parentb4add146a02286102916a815f2ed0ba3f76cfd7b
parent945f0fcd0179210ae5b72006c3621a73cc6e9205
Merge branch 'master' into devel-3.2

Conflicts:
Incremental.c
Manage.c
ReadMe.c
inventory
mdadm.8.in
mdadm.spec
mdassemble.8
mdmon.8
Manage.c
inventory