projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b0b755
4977ab6
)
Merge branch 'linus' into perf/urgent, to resolve conflict
author
Ingo Molnar
<mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000
(08:05 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 2 Mar 2017 07:05:45 +0000
(08:05 +0100)
Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff