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

Merge branch 'v6v7' into devel 

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig
parents 1f0090a1 3ba6e69a
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