Merge branch 'v6v7' into devel

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig
This commit is contained in:
Russell King 2011-03-16 23:35:26 +00:00
commit bd1274dc00
28 changed files with 191 additions and 189 deletions