diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 11:27:07 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 11:27:07 +0000 |
| commit | 8213084125eed3c5efbc5e13739b93dfedb88590 (patch) | |
| tree | b98d91de82a4a39a47c6031832271341ecf5e8e0 /include/linux | |
| parent | [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports (diff) | |
| parent | [ARM] 4211/1: Provide a defconfig for ns9xxx (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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions