]> git.ipfire.org Git - thirdparty/mdadm.git/commit
Merge branch 'master' into devel-3.2
authorNeilBrown <neilb@suse.de>
Mon, 13 Dec 2010 03:00:05 +0000 (14:00 +1100)
committerNeilBrown <neilb@suse.de>
Mon, 13 Dec 2010 03:00:05 +0000 (14:00 +1100)
commit1d54f2867b928bb1c3374f269599b8cbcb293193
tree4dde47217b16816a8507ad49e170f31a77545e71
parent833bb0f8f61c576895a2ec90c344c148c08dadba
parenta2973b6af235f993b3085cfb51bc50cc6ca38d38
Merge branch 'master' into devel-3.2

Conflicts:
super-intel.c
super-intel.c