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