From: Olof Johansson Date: Thu, 2 Jan 2014 19:39:51 +0000 (-0800) Subject: Merge tag 'mvebu-soc-3.14-2' of git://git.infradead.org/linux-mvebu into next/cleanup X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=26d5f92adf87b1267feb8727ec59c4d0c0d933be;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git 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 --- 26d5f92adf87b1267feb8727ec59c4d0c0d933be