commit 6d12e796981254677a30366dd16b0a59bda2d898
author Arnd Bergmann <arnd@arndb.de> Wed Jun 25 15:34:00 2014 +0200
committer Arnd Bergmann <arnd@arndb.de> Wed Jun 25 20:26:30 2014 +0200
tree bfee90fb514db5c72da5a5037e1cfcd93e5dd54f
parent 11f9323a48875101bc4de6077155c17aed82cfc8
parent 8dbdb8e704db34085f5978c335c10256b0fb9629

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