| commit | e4340bbb07dd38339c0773543dd928886e512a57 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Oct 28 13:17:01 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Oct 28 13:17:20 2015 +0100 |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 | |
| parent | c13dc31adb04c3f85d54d2fa13e34206f25742eb [diff] | |
| parent | a22c4d7e34402ccdf3414f64c50365436eba7b93 [diff] |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict Signed-off-by: Ingo Molnar <mingo@kernel.org>