Merge branch 'mvebu/soc-3xx' into mvebu/soc

diff --cc arch/arm/mach-mvebu/Kconfig
index 1ba825ee3fe58cfcc14e00e98ed5f5c64fc74f73,00dc4a6ace6ee408a61ee3879fdac3d4f1cebc38..4b1eea09ae9334e463769577657779f490325594
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -19,9 -19,9 +19,9 @@@ config ARCH_MVEB
  
  if ARCH_MVEBU
  
 -menu "Marvell SOC with device tree"
 +menu "Marvell EBU SoC variants"
  
- config MACH_ARMADA_370_XP
+ config MACH_MVEBU_V7
        bool
        select ARMADA_370_XP_TIMER
        select HAVE_SMP