| commit | d9322d226f91ad95825ab68f3e5cfeda7b9c4553 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue May 03 11:49:21 2016 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue May 03 11:49:21 2016 -0500 |
| tree | b064cdad836596d765d716b34244e73c2f08d7f1 | |
| parent | 58f8b094e96f12e899bf767fc658c165908065d4 [diff] | |
| parent | 26e515713342b6f7c553aa3c66b21c6ab7cf82af [diff] | |
| parent | c20e128030caf0537d5e906753eac1c28fefdb75 [diff] | |
| parent | 2ffa9a5d76a75abbc1f95c17959fced666095bdd [diff] |
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