Merge tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu into next/cleanup
From Jason Cooper:
mvebu SoC changes for v3.14 (incremental #2)
- mvebu
- some Armada cleanup to prep for a new SoC in mach-mvebu/
* tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: move Armada 370/XP specific definitions to armada-370-xp.h
ARM: mvebu: remove prototypes of non-existing functions from common.h
ARM: mvebu: move ARMADA_XP_MAX_CPUS to armada-370-xp.h
Signed-off-by: Olof Johansson <olof@lixom.net>