]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/pci.fixes' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 9 Aug 2011 17:05:01 +0000 (13:05 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 9 Aug 2011 17:05:01 +0000 (13:05 -0400)
* stable/pci.fixes:
  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.

1  2 
drivers/pci/xen-pcifront.c

Simple merge