tree ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6
parent 6f95416ebe81b3ad63884538555efb81cb05749f
parent 28bd3a0dcce11bea6f99a351cc64053dff00196e
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1178481509 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1178481509 +0100

Merge branch 'ixp4xx' into devel

Conflicts:

	include/asm-arm/arch-ixp4xx/io.h