Merge branch 'for-2.6.26' of git://neil.brown.name/md