Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...

author Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/proc-arm920.S
Simple merge
diff --cc arch/arm/mm/proc-v6.S
Simple merge
diff --cc arch/arm/mm/proc-v7.S
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-arm920.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-v6.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/proc-v7.S	patch \|	diff1 \|	diff2 \|	blob \| history