]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f408d5 73c8f0c 05aa7d6)
Merge branches 'pci/host-dra7xx' and 'pci/host-iproc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 14 Aug 2015 13:21:16 +0000 (08:21 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 14 Aug 2015 13:21:16 +0000 (08:21 -0500)
* 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

1  2  3 
drivers/pci/host/pci-dra7xx.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/pci/host/pci-dra7xx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.