Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
This commit is contained in:
Arnd Bergmann
2011-07-17 21:43:26 +02:00
24 changed files with 918 additions and 8 deletions

View File

@@ -0,0 +1,7 @@
Xilinx Zynq EP107 Emulation Platform board
This board is an emulation platform for the Zynq product which is
based on an ARM Cortex A9 processor.
Required root node properties:
- compatible = "xlnx,zynq-ep107";