]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/pci.fixes-3.2' of git://oss.oracle.com/git/kwilk/xen into uek2...
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 19 Oct 2011 19:44:10 +0000 (15:44 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 19 Oct 2011 19:44:10 +0000 (15:44 -0400)
commit1d49c6c2b109b94ae9c30a9ca01f512837baeb97
tree7e4e221af76293f07d651213a69f31e1fbe73ffb
parenta81fb81ed5193bb517b5d482b20ace225f60aac0
parent55e901fc1f03dd8437f877813c68b6014cdbeefd
Merge branch 'stable/pci.fixes-3.2' of git://oss.oracle.com/git/kwilk/xen into uek2-merge

* 'stable/pci.fixes-3.2' of git://oss.oracle.com/git/kwilk/xen:
  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.
arch/x86/pci/xen.c