Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel...

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

Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)

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

Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-davinci/sleep.S
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/sleep.S	patch \|	diff1 \|	diff2 \|	blob \| history