| commit | 8213084125eed3c5efbc5e13739b93dfedb88590 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sun Feb 18 11:27:07 2007 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Feb 18 11:27:07 2007 +0000 |
| tree | b98d91de82a4a39a47c6031832271341ecf5e8e0 | |
| parent | 66822b2eef8de9fe3ec9fa837386817565dbe690 [diff] | |
| parent | b77bfa84c419e3ec8b8e3fd4b4579e5761b7c943 [diff] |
Merge NetSilicon NS93xx tree Fixed conflicts: arch/arm/Makefile arch/arm/mm/Kconfig Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>