Merge branches 'fixes' and 'mmci' into for-linus