diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-06 21:58:29 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-06 21:58:29 +0200 |
| commit | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch) | |
| tree | ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /include/asm-arm/mach | |
| parent | Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns... (diff) | |
| parent | [ARM] 4318/2: DSM-G600 Board Support (diff) | |
| download | linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.tar.xz linux-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.zip | |
Merge branch 'ixp4xx' into devel
Conflicts:
include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'include/asm-arm/mach')
0 files changed, 0 insertions, 0 deletions