Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
Russell King [Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)]
1  2 
arch/arm/Kconfig
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S

Simple merge
Simple merge
Simple merge
Simple merge