tree f38d9d2f929037325362328415b2a1e7bfe52a15
parent c13dc31adb04c3f85d54d2fa13e34206f25742eb
parent a22c4d7e34402ccdf3414f64c50365436eba7b93
author Ingo Molnar <mingo@kernel.org> 1446034621 +0100
committer Ingo Molnar <mingo@kernel.org> 1446034640 +0100

Merge branch 'linus' into core/rcu, to fix up a semantic conflict

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