Merge branch 'stable/pci.fixes-3.2' into linux-next

Merge branch 'stable/pci.fixes-3.2' into linux-next

* stable/pci.fixes-3.2:
  xen/pci: support multi-segment systems
  xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
  xen/pci: make bus notifier handler return sane values
  xen-swiotlb: fix printk and panic args
  xen-swiotlb: Fix wrong panic.
  xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
  xen-pcifront: Update warning comment to use 'e820_host' option.

Conflicts:
	drivers/xen/pci.c