Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:51:06 +0000 (07:51 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:51:06 +0000 (07:51 -0800)
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

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/mach-imx/clk-imx25.c
arch/arm/mach-imx/clk-imx27.c
arch/arm/mach-imx/devices/platform-mxc-mmc.c
arch/arm/mach-imx/mm-imx3.c
drivers/dma/imx-dma.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge