Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next