Merge branch 'zynq/master' of...
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
Showing
arch/arm/boot/dts/zynq-ep107.dts
0 → 100644
arch/arm/mach-zynq/Makefile
0 → 100644
arch/arm/mach-zynq/Makefile.boot
0 → 100644
arch/arm/mach-zynq/board_dt.c
0 → 100644
arch/arm/mach-zynq/common.c
0 → 100644
arch/arm/mach-zynq/common.h
0 → 100644
arch/arm/mach-zynq/timer.c
0 → 100644
想要评论请 注册 或 登录