Merge NetSilicon NS93xx tree
Fixed conflicts:
arch/arm/Makefile
arch/arm/mm/Kconfig
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
Showing
arch/arm/configs/ns9xxx_defconfig
0 → 100644
arch/arm/mach-ns9xxx/Kconfig
0 → 100644
arch/arm/mach-ns9xxx/Makefile
0 → 100644
arch/arm/mach-ns9xxx/generic.c
0 → 100644
arch/arm/mach-ns9xxx/generic.h
0 → 100644
arch/arm/mach-ns9xxx/irq.c
0 → 100644
arch/arm/mach-ns9xxx/time.c
0 → 100644
include/asm-arm/arch-ns9xxx/dma.h
0 → 100644
include/asm-arm/arch-ns9xxx/io.h
0 → 100644
想要评论请 注册 或 登录