git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66822b2 b77bfa8)
Merge NetSilicon NS93xx tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 18 Feb 2007 11:27:07 +0000 (11:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 18 Feb 2007 11:27:07 +0000 (11:27 +0000)
Fixed conflicts:

arch/arm/Makefile
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Trivial merge
Pandora Kernel Repository