From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 3 May 2016 16:49:21 +0000 (-0500)
Subject: Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9322d226f91ad95825ab68f3e5cfeda7b9c4553;p=linux-beck.git

Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next

* pci/dpc:
  PCI: Add Downstream Port Containment driver
  PCI: Add Downstream Port Containment portdrv service type
  PCI: Widen portdrv service type from 4 bits to 8 bits

* pci/resource:
  alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IO
  PCI: Supply CPU physical address (not bus address) to iomem_is_exclusive()

* pci/thunderbolt:
  thunderbolt: Fix double free of drom buffer
---

d9322d226f91ad95825ab68f3e5cfeda7b9c4553