Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next