Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Wed, 7 Oct 2015 09:24:24 +0000 (11:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 Oct 2015 09:24:24 +0000 (11:24 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge