From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Feb 2013 23:59:37 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v3.9-rc1~86
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8d168f71551ec2a6528d01d0389b7a73c091e3e7;p=~emulex%2Finfiniband.git

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
---

8d168f71551ec2a6528d01d0389b7a73c091e3e7