git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ba0951 f51770e)
Merge remote-tracking branch 'kvm/next' into queue
authorChristoffer Dall <christoffer.dall@linaro.org>
Fri, 19 Sep 2014 01:15:32 +0000 (18:15 -0700)
committerChristoffer Dall <christoffer.dall@linaro.org>
Fri, 19 Sep 2014 01:15:32 +0000 (18:15 -0700)
Conflicts:
arch/arm64/include/asm/kvm_host.h
virt/kvm/arm/vgic.c


Trivial merge
Pandora Kernel Repository