Merge branch 'linus' into locking/core, to pick up fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Fri, 18 Sep 2015 07:25:12 +0000 (09:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 18 Sep 2015 07:25:12 +0000 (09:25 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge