]> err.no Git - linux-2.6/commit
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)
commit8213084125eed3c5efbc5e13739b93dfedb88590
treeb98d91de82a4a39a47c6031832271341ecf5e8e0
parent66822b2eef8de9fe3ec9fa837386817565dbe690
parentb77bfa84c419e3ec8b8e3fd4b4579e5761b7c943
Merge NetSilicon NS93xx tree

Fixed conflicts:

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mm/Kconfig