Merge branch 'pci/host-rcar' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jul 2017 16:00:58 +0000 (11:00 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jul 2017 16:00:58 +0000 (11:00 -0500)
commit66a63e15bf7482c1de5cc906cbc473943ed8e898
treee47d70839da3458a572bd7d5c2195117f2983daa
parentbec36cfa7bd43a1e4484b14ff6144855f3446c4c
parentbf44167f37a12bd353ed10fa706691d3f6e4b1a0
Merge branch 'pci/host-rcar' into next

* pci/host-rcar:
  PCI: rcar-gen2: Make of_device_ids const
  PCI: rcar: Use proper name for the R-Car SoC