Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Oct 2011 12:40:54 +0000 (13:40 +0100)
commitcefd3e71efca6f4ef7f06f1fc507771d76072741
treed76cb7969435d5eccdbd3d081555d0a8203ede4a
parenta26bce1220a4c5a7a074a779e6aad3cae63a94f7
parent0cdc8b921d68817b687755b4f6ae20cd8ff1d026
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
arch/arm/Kconfig
arch/arm/mach-davinci/sleep.S