Merge branches 'pci/domain' and 'pci/hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 29 Dec 2014 16:09:19 +0000 (09:09 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 29 Dec 2014 16:09:19 +0000 (09:09 -0700)
commit85aae3fcfedd8df73d55ab942beb06c29e66b39a
treee2e1c721a848f87bb18b8945bcc8447b45836432
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672
parent8c7d14746abce601b768533c3ccb3f3e64f98551
parent17f14b51f2dc2fce2636ee49c5fbf49ff27aecb0
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