git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a26bce1 0cdc8b9)
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)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-davinci/sleep.S patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-davinci/sleep.S
Simple merge
Pandora Kernel Repository