]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
commit66267ee58732bb4c21c7bbba004ee481b8ad2b30
treebf7f72e623d7c1ca6472e0a1286e802cd3bff139
parent6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d
parentf58007762f537ba13674a3138b3f4c20fff1cba9
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
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