Merge branch 'stable/for-linus-3.4' into linux-next

* stable/for-linus-3.4:
  xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success
  xen/pciback: fix XEN_PCI_OP_enable_msix result
  xen/smp: Remove unnecessary call to smp_processor_id()
  xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'
  xen: only check xen_platform_pci_unplug if hvm

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc arch/x86/xen/smp.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge