]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ixp4xx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 May 2007 19:58:29 +0000 (20:58 +0100)
commit2312f54b1ca7e2676347b3120ff39e6f4ebe40a8
treeea05bfdbae04eb5ffbafa2c58fc68897a3f541d6
parent5a7d2748ce457ec5de22f655b641a200f8097b09
parent3f2aac854b422211aa8237dc41776d62b8a3ffbc
Merge branch 'ixp4xx' into devel

Conflicts:

include/asm-arm/arch-ixp4xx/io.h
arch/arm/mach-ixp4xx/common.c
include/asm-arm/arch-ixp4xx/io.h