Skip to content
Commit 82130841 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge NetSilicon NS93xx tree 



Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents 66822b2e b77bfa84
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment