From: Scott Wood <scottwood@freescale.com>
Date: Wed, 11 Apr 2012 20:27:52 +0000 (-0500)
Subject: KVM: PPC: add CPU_FTR_EMB_HV to CPU table
X-Git-Tag: v3.5-rc1~88^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9de6fe91afcdc38efe398a9d42014a7c920a64db;p=pandora-kernel.git

KVM: PPC: add CPU_FTR_EMB_HV to CPU table

e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f,
"powerpc: Add initial e6500 cpu support" and the introduction of
CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68,
"KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU
table entry missing CPU_FTR_EMB_HV.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

Reading git-diff-tree failed