Arnd Bergmann 3a6cb8ce07 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		2011-07-17 21:43:26 +02:00
..
sirf.txt	ARM: CSR: Adding CSR SiRFprimaII board support	2011-07-09 07:19:28 +08:00
xilinx.txt