Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix
authorIngo Molnar <mingo@kernel.org>
Sat, 5 Sep 2015 07:00:30 +0000 (09:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 5 Sep 2015 07:00:47 +0000 (09:00 +0200)
commit95cd2ea7d54b41b0b2828587f108fe270d59eede
tree623675092834a6a92ac1ef28cc5abb930c9a11b0
parent66c117d7fa2ae429911e60d84bf31a90b2b96189
parente713c80a4e49d4bed5324d24755e42bf01c87556
Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/cpufeature.h