Merge branch 'stable/for-linus-fixes-3.3' into linux-next

* stable/for-linus-fixes-3.3:
  xenbus_dev: add missing error check to watch handling
  xen/pci[front|back]: Use %d instead of %1x for displaying PCI devfn.
  xen pvhvm: do not remap pirqs onto evtchns if !xen_have_vector_callback
  xen/smp: Fix CPU online/offline bug triggering a BUG: scheduling while atomic.
  xen/bootup: During bootup suppress XENBUS: Unable to read cpu state

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

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

diff --cc drivers/xen/xen-pciback/pci_stub.c
Simple merge