From: Avi Kivity Date: Sun, 15 Jul 2012 09:41:47 +0000 (+0300) Subject: Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next X-Git-Tag: v3.6-rc1~124^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=64604e09ec3389cfc9668136a9302a3832cf0095;p=~emulex%2Finfiniband.git Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next ppc queue from Alex Graf: * Prepare some of the booke code for 64 bit support * BookE: Fix ESR flag in DSI * BookE: Add rfci emulation * 'for-upstream' of git://github.com/agraf/linux-2.6: KVM: PPC: Critical interrupt emulation support KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests KVM: PPC64: booke: Set interrupt computation mode for 64-bit host KVM: PPC: bookehv: Add ESR flag to Data Storage Interrupt KVM: PPC: bookehv64: Add support for std/ld emulation. booke: Added crit/mc exception handler for e500v2 booke/bookehv: Add host crit-watchdog exception support Signed-off-by: Avi Kivity --- 64604e09ec3389cfc9668136a9302a3832cf0095