Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

diff --cc arch/arm/Kconfig
index aa6c91d,9e76a75..7dc5986
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -337,6 -337,6 +337,19 @@@ config ARCH_GEMIN
        help
          Support for the Cortina Systems Gemini family SoCs
  
++config ARCH_PRIMA2
++      bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
++      select CPU_V7
++      select GENERIC_TIME
++      select NO_IOPORT
++      select GENERIC_CLOCKEVENTS
++      select CLKDEV_LOOKUP
++      select GENERIC_IRQ_CHIP
++      select USE_OF
++      select ZONE_DMA
++      help
++          Support for CSR SiRFSoC ARM Cortex A9 Platform
++
  config ARCH_EBSA110
        bool "EBSA-110"
        select CPU_SA110
@@@ -880,19 -880,19 +893,18 @@@ config ARCH_VT850
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
  
- config ARCH_PRIMA2
-       bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
+ config ARCH_ZYNQ
+       bool "Xilinx Zynq ARM Cortex A9 Platform"
        select CPU_V7
        select GENERIC_TIME
-       select NO_IOPORT
        select GENERIC_CLOCKEVENTS
        select CLKDEV_LOOKUP
-       select GENERIC_IRQ_CHIP
+       select ARM_GIC
+       select ARM_AMBA
+       select ICST
        select USE_OF
-       select ZONE_DMA
        help
-           Support for CSR SiRFSoC ARM Cortex A9 Platform
- 
+         Support for Xilinx Zynq ARM Cortex A9 Platform
 -
  endchoice
  
  #

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mm/Kconfig
index edf0681,f046982..a0ea584
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -821,7 -821,7 +821,8 @@@ config CACHE_L2X
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
                   REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
                   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
-                  ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_PRIMA2
 -                 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_ZYNQ
++                 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
++                 ARCH_PRIMA2 || ARCH_ZYNQ
        default y
        select OUTER_CACHE
        select OUTER_CACHE_SYNC