From: Arnd Bergmann Date: Fri, 23 May 2014 16:11:01 +0000 (+0200) Subject: Merge tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes X-Git-Tag: v3.15-rc8~22^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=85aea469ef65091ddcfadb848af1ef7ef1d9cedd;p=~emulex%2Finfiniband.git 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 --- 85aea469ef65091ddcfadb848af1ef7ef1d9cedd