Merge back intel_pstate updates for 4.12.