Merge branch 'linus' into x86/asm, before applying dependent patch
authorIngo Molnar <mingo@kernel.org>
Fri, 8 May 2015 11:33:33 +0000 (13:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 8 May 2015 11:33:33 +0000 (13:33 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge