tree 66ff8e345cf693cfb39383f25ad796e2f59ab6ad
parent 5ec4c599a52362896c3e7c6a31ba6145dca9c6f5
parent c95389b4cd6a4b52af78bea706a274453e886251
author Ingo Molnar <mingo@kernel.org> 1377770528 +0200
committer Ingo Molnar <mingo@kernel.org> 1377770528 +0200

Merge branch 'linus' into perf/core

Pick up the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>