On Apr 11, 2012, at 3:27 PM, Scott Wood wrote: > 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@xxxxxxxxxxxxx> > --- > Fixup patch for the KVM merge as requested by Marcelo. > > arch/powerpc/include/asm/cputable.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> - k -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
