Merge NetSilicon NS93xx tree
Fixed conflicts:
arch/arm/Makefile
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Showing
This diff is collapsed.
arch/arm/mach-ns9xxx/Kconfig
0 → 100644
arch/arm/mach-ns9xxx/irq.c
0 → 100644
arch/arm/mach-ns9xxx/time.c
0 → 100644
Please register or sign in to comment