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