Merge branch 'linus' into timers/core, to refresh the branch
authorIngo Molnar <mingo@kernel.org>
Thu, 8 Sep 2016 12:05:16 +0000 (14:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 8 Sep 2016 12:05:16 +0000 (14:05 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge