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
commit 3a6cb8ce07
24 changed files with 918 additions and 8 deletions