]> git.ipfire.org Git - thirdparty/mdadm.git/commit - Makefile
projects / thirdparty / mdadm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa8d7dc cd19c0c)
Merge branch 'master' into devel-3.2
authorNeilBrown <neilb@suse.de>
Thu, 9 Dec 2010 00:16:42 +0000 (11:16 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 9 Dec 2010 00:16:42 +0000 (11:16 +1100)
commitf80c8614b0014fde1220591fcc4a1365c9cde0c4
treece1f2aabf6db47f6d0e80bf745a7523196a8870etree | snapshot
parentaa8d7dc71400fa7f7d70fed990defe012f49e835commit | diff
parentcd19c0cf1c52ce765bf27791b5ef0ee4cdc4c8dbcommit | diff
Merge branch 'master' into devel-3.2

Conflicts:
mdadm.8.in

Same conceptual change was written with different words in each version.
Signed-off-by: NeilBrown <neilb@suse.de>
mdadm.8.in diff1 | diff2 | blob | history
super1.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.