git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77f01bd
4068890
)
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
author
Paolo Bonzini
<pbonzini@redhat.com>
Wed, 29 Jan 2014 17:29:01 +0000
(18:29 +0100)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Wed, 29 Jan 2014 17:29:01 +0000
(18:29 +0100)
Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff