Merge branch 'pci/host-rcar' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:15:39 +0000 (15:15 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:15:39 +0000 (15:15 -0600)
* pci/host-rcar:
  PCI: rcar: Use of_device_get_match_data() to simplify probe
  PCI: rcar: Add compatible string for r8a7796
  PCI: rcar: Return -ENODEV from host bridge probe when no card present


Trivial merge