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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/include/asm/cpufeature.h

Simple merge