| commit | e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Feb 13 08:30:07 2016 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Feb 13 08:30:07 2016 +0100 |
| tree | 7ccf35788cbb9def996204399f079366da251361 | |
| parent | fed0764fafd8e2e629a033c0f7df4106b0dcb7f0 [diff] | |
| parent | 0cbb0b92689a1c4e0ac55f6188be563a813ac808 [diff] |
Merge branch 'linus' into locking/core, to resolve conflicts Conflicts: kernel/locking/lockdep.c Signed-off-by: Ingo Molnar <mingo@kernel.org>