]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32dc43e 3b8cd8a)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Feb 2013 23:59:37 +0000 (15:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Feb 2013 23:59:37 +0000 (15:59 -0800)
commit8d168f71551ec2a6528d01d0389b7a73c091e3e7
treefd90ed4b806cfb5b5f5c44172b667024598769f7tree | snapshot
parent32dc43e40a2707d0cb1ab8768d080c3e9bcfed52commit | diff
parent3b8cd8a015f3db85624c0fdb591956aed7f61b65commit | diff
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM ARM compile fixes from Gleb Natapov:
 "Fix ARM KVM compilation breakage due to changes from kvm.git"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
  ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
  ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
Linux kernel for KaRo TX COM modules