Russell King bd1274dc00 Merge branch 'v6v7' into devel ...

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig

2011-03-16 23:35:26 +00:00

..

asm

Merge branch 'v6v7' into devel

2011-03-16 23:35:26 +00:00