Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:07 +0000 (21:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:33:07 +0000 (21:33 +0100)
commit6defd90433729c2d795865165cb34d938d8ff07c
treeebb963c6db463296b8f926d79d7ddc8c1251ca24
parentc97f68145e8067b3ac4b126a6faebf90f9ffc302
parent99c6bb390cf599b9e0aa6e69beacc4e5d875bf77
Merge branch 'for-rmk' of git://git.marvell.com/orion

Merge branch 'orion-devel' into devel
arch/arm/Kconfig
arch/arm/configs/orion5x_defconfig
arch/arm/mach-orion5x/common.h
arch/arm/mach-orion5x/kurobox_pro-setup.c
arch/arm/mm/proc-feroceon.S