Merge branch 'linus' into perf/core, to refresh the branch
authorIngo Molnar <mingo@kernel.org>
Tue, 21 Jul 2015 05:57:44 +0000 (07:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 21 Jul 2015 05:57:44 +0000 (07:57 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge