From: Bjorn Helgaas Date: Fri, 13 Dec 2013 17:20:05 +0000 (-0700) Subject: Merge branch 'pci/misc' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c52f51ccbb371d9161a1081560df7d31df4c495;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'pci/misc' into next * pci/misc: PCI: Stop clearing bridge Secondary Status when setting up I/O aperture PCI: Prevent bus conflicts while checking for bridge apertures PCI: Drop "irq" param from *_restore_msi_irqs() PCI/portdrv: Remove superfluous name cast PCI: Clear NumVFs when disabling SR-IOV in sriov_init() --- 6c52f51ccbb371d9161a1081560df7d31df4c495