Merge branch 'x86/urgent' into perf/core, to pick up dependency
authorIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 10:03:16 +0000 (12:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 10:03:16 +0000 (12:03 +0200)
commit020d704c3e107eba4b416b9013179437a128b454
tree2dce22a2e336f4b9fea9afbe2ef5b27d7ea296b3
parentb8ab92201a64886fd3d8078fe46e51f658379823
parent970442c599b22ccd644ebfe94d1d303bf6f87c05
Merge branch 'x86/urgent' into perf/core, to pick up dependency

We are going to clean up perf's use of magic Intel model numbers,
so merge in the prerequisite commit that adds the model number
defines.

Signed-off-by: Ingo Molnar <mingo@kernel.org>