diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-12-29 17:09:19 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-12-29 17:09:19 +0100 |
| commit | 85aae3fcfedd8df73d55ab942beb06c29e66b39a (patch) | |
| tree | e2e1c721a848f87bb18b8945bcc8447b45836432 /drivers/pci | |
| parent | Linux 3.19-rc1 (diff) | |
| parent | ARM/PCI: Move to generic PCI domains (diff) | |
| parent | PCI: Delete unnecessary NULL pointer checks (diff) | |
| download | linux-85aae3fcfedd8df73d55ab942beb06c29e66b39a.tar.xz linux-85aae3fcfedd8df73d55ab942beb06c29e66b39a.zip | |
Merge branches 'pci/domain' and 'pci/hotplug' into next
* pci/domain:
ARM/PCI: Move to generic PCI domains
CNS3xxx: Remove artificial dependency on pci_sys_data domain.
PCI: Move domain assignment from arm64 to generic code
* pci/hotplug:
PCI: Delete unnecessary NULL pointer checks