Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek:

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings
  + Linux 3.7-rc3

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 451757d,554cfac..97252d8
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -195,9 -196,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)                += zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -plat-$(CONFIG_ARCH_MXC)               += mxc
  plat-$(CONFIG_ARCH_OMAP)      += omap
  plat-$(CONFIG_ARCH_S3C64XX)   += samsung
- plat-$(CONFIG_ARCH_ZYNQ)      += versatile
  plat-$(CONFIG_PLAT_IOP)               += iop
  plat-$(CONFIG_PLAT_NOMADIK)   += nomadik
  plat-$(CONFIG_PLAT_ORION)     += orion

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge

diff --cc arch/arm/mach-imx/clk-imx25.c
Simple merge

diff --cc arch/arm/mach-imx/clk-imx27.c
Simple merge

diff --cc arch/arm/mach-imx/devices/platform-mxc-mmc.c
Simple merge

diff --cc arch/arm/mach-imx/mm-imx3.c
Simple merge

diff --cc drivers/dma/imx-dma.c
Simple merge