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)
commitf6f4bbc997ed23540d23ff3f073dd1ac091c6984
tree9148c4c99607822abc0a58c80d658a6e85990c8b
parentdb06d759d6cf903aeda8c107fd3abd366dd80200
parentce53da02ebfbe93ec58dd6150b28b4606330ead5
Merge branch 'x86/cpu' into x86/platform, to avoid conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/cpufreq/intel_pstate.c