Merge branch 'x86/cpu' into x86/platform, to avoid conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 10:25:07 +0000 (12:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 10:25:07 +0000 (12:25 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
drivers/cpufreq/intel_pstate.c

Simple merge