From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 25 Jun 2014 13:34:00 +0000 (+0200)
Subject: Merge tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d12e796981254677a30366dd16b0a59bda2d898;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu into fixes

Merge "mvebu fixes for v3.16" from Jason Cooper:

 - mvebu
    - Fix broken SoC ID detection
    - Select ARM_CPU_SUSPEND for v7
    - Remove armada38x compatible string (no users yet)

 - kirkwood
    - Fix phy-connection-type on GuruPlug board

* tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
  ARM: dts: kirkwood: fix phy-connection-type for Guruplug
  ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
  ARM: mvebu: Fix broken SoC ID detection
---

6d12e796981254677a30366dd16b0a59bda2d898