Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next