tree fd90ed4b806cfb5b5f5c44172b667024598769f7
parent 32dc43e40a2707d0cb1ab8768d080c3e9bcfed52
parent 3b8cd8a015f3db85624c0fdb591956aed7f61b65
author Linus Torvalds <torvalds@linux-foundation.org> 1361836777 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1361836777 -0800

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