Merge branch 'x86/cpufeature' into x86/urgent, because it's ready
authorIngo Molnar <mingo@kernel.org>
Mon, 31 Aug 2015 17:47:03 +0000 (19:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 31 Aug 2015 17:47:03 +0000 (19:47 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge