NeilBrown: Merge branch 'klockwork' of git://github.com/djbw/mdadm

[Martin F. Krafft]

Module: mdadm
Branch: upstream
Commit: 8409bc51e828bdf748138882e89229d6f6080b7c
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=8409bc51e828bdf748138882e89229d6f6080b7c

Author: NeilBrown <neilb at suse.de>
Date:   Wed Dec 30 13:46:52 2009 +1100

Merge branch 'klockwork' of git://github.com/djbw/mdadm

Conflicts:
	super-intel.c

---