From: Avi Kivity <avi@redhat.com>
Date: Wed, 6 Jun 2012 12:31:34 +0000 (+0300)
Subject: Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25e531a988ea5a64bd97a72dc9d3c65ad5850120;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next

Alex says:

"Changes this time include:

  - Generalize KVM_GUEST support to overall ePAPR code
  - Fix reset for Book3S HV
  - Fix machine check deferral when CONFIG_KVM_GUEST=y
  - Add support for BookE register DECAR"

* 'for-upstream' of git://github.com/agraf/linux-2.6:
  KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.
  KVM: PPC: booke: Added DECAR support
  KVM: PPC: Book3S HV: Make the guest hash table size configurable
  KVM: PPC: Factor out guest epapr initialization

Signed-off-by: Avi Kivity <avi@redhat.com>
---

25e531a988ea5a64bd97a72dc9d3c65ad5850120