diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-14 08:21:16 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-14 08:21:16 -0500 |
| commit | f0d9ac7510ee06162c9db31851a1169ae716867e (patch) | |
| tree | d76988d95fab38f0bbfa76b16d25fcf8e21e7120 /lib/stmp_device.c | |
| parent | 1f408d57437e53ae9aa6edb335ff9fe7ba7aba2c (diff) | |
| parent | 73c8f0cbb04ab6bb549d74324fdc2b8b49330724 (diff) | |
| parent | 05aa7d6a72c1fca809e4d8bfdc5fa202cb8bed37 (diff) | |
Merge branches 'pci/host-dra7xx' and 'pci/host-iproc' into next
* pci/host-dra7xx:
ARM: dts: am57xx-evm: Add 'gpios' property with gpio2_8
PCI: dra7xx: Add support to make GPIO drive PERST# line
PCI: dra7xx: Clear MSE bit during suspend so clocks will idle
PCI: dra7xx: Add PM support
PCI: dra7xx: Disable pm_runtime on get_sync failure
* pci/host-iproc:
PCI: iproc: Allow BCMA bus driver to be built as module
PCI: iproc: Add arm64 support
PCI: iproc: Delete unnecessary checks before phy calls