projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fed0764
0cbb0b9
)
Merge branch 'linus' into locking/core, to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sat, 13 Feb 2016 07:30:07 +0000
(08:30 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Sat, 13 Feb 2016 07:30:07 +0000
(08:30 +0100)
Conflicts:
kernel/locking/lockdep.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff