Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
authorNeilBrown <neilb@suse.de>
Tue, 10 Aug 2010 00:02:33 +0000 (10:02 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 10 Aug 2010 00:02:33 +0000 (10:02 +1000)

Trivial merge