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