summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-06 20:58:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-06 20:58:29 +0100
commit5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch)
treeea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /arch/arm/kernel
parent6f95416ebe81b3ad63884538555efb81cb05749f (diff)
parent28bd3a0dcce11bea6f99a351cc64053dff00196e (diff)
downloadop-kernel-dev-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.zip
op-kernel-dev-5cd47155155a32e5b944ac9fc3f3dc578e429aa0.tar.gz
Merge branch 'ixp4xx' into devel
Conflicts: include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'arch/arm/kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud