From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 15 Apr 2013 20:37:28 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: firefly_0821_release~3680^2~680^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30e22b2337be44f4363fa52858d1ca7be6794ee8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Clean up quirk_io_region
  PCI: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
  PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number
  PCI: Remove unnecessary dependencies between PME and ACPI
  [SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  [SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  PCI: Define macro for Marvell vendor ID
  PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210X
  PCI: aer_inject: Fix return values when device not found
---

30e22b2337be44f4363fa52858d1ca7be6794ee8