projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8ab922 970442c)
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)
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>

Trivial merge