projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ffcb09f
e34af78
)
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
author
Radim Krčmář
<rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000
(14:49 +0100)
committer
Radim Krčmář
<rkrcmar@redhat.com>
Tue, 6 Dec 2016 13:49:05 +0000
(14:49 +0100)
Eliminate merge conflict between
9e5f68842276
and
ebe4535fbe7a
.
Trivial merge