tree b90dfe550a2ebadc3b35af0a47655138cfcc6237
parent c354e811a911e680f5c53baa5cdb5d36e660237b
parent b391bf31584d879d7455e882a5e200388c8be9ac
author Bjorn Helgaas <bhelgaas@google.com> 1387400644 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1387400644 -0700

Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Remove unneeded 'goto err'
  PCI: imx6: Remove unneeded check of platform_get_resource()