summary refs log tree commit diff
path: root/mm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-23 18:11:01 +0200
committerArnd Bergmann <arnd@arndb.de>2014-05-23 18:11:01 +0200
commit85aea469ef65091ddcfadb848af1ef7ef1d9cedd (patch)
tree110a0ceb0797f756b3ff35d82deb2e6b53376bd0 /mm
parent767bf9f00ec753a3bba653844d7b858b8720707f (diff)
parentd903bc9ee9b67410d02923d98a8dd4ecf5a1bc69 (diff)
downloadlinux-85aea469ef65091ddcfadb848af1ef7ef1d9cedd.tar.gz
Merge tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for v3.15 (incremental #2)

 - Armada 38x
    - fix PCIe dt nodes for handling more interfaces

 - mvebu
    - mvebu-soc-id: fix clock handling and PCIe interface disabling.

* tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: fix definitions of PCIe interfaces on Armada 38x
  ARM: mvebu: mvebu-soc-id: keep clock enabled if PCIe unit is enabled
  ARM: mvebu: mvebu-soc-id: add missing clk_put() call

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions