Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
authorIngo Molnar <mingo@kernel.org>
Fri, 25 Sep 2015 07:28:58 +0000 (09:28 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 25 Sep 2015 07:28:58 +0000 (09:28 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge