projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a27f51
3f25777
)
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
author
Paul Mackerras
<paulus@ozlabs.org>
Fri, 9 Sep 2016 06:24:23 +0000
(16:24 +1000)
committer
Paul Mackerras
<paulus@ozlabs.org>
Fri, 9 Sep 2016 06:24:23 +0000
(16:24 +1000)
This merges the topic branch 'kvm-ppc-infrastructure' into kvm-ppc-next
so that I can then apply further patches that need the changes in the
kvm-ppc-infrastructure branch.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1
2
arch/powerpc/kvm/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/kvm/Makefile
Simple merge