Merge branch 'master' of git://git.denx.de/u-boot-marvell

arch/arm/include/asm/arch-kirkwood/kirkwood.h

arch/arm/include/asm/arch-orion5x/orion5x.h

arch/powerpc/include/asm/config.h

common/cmd_ide.c

doc/README.PXA_CF

drivers/block/Makefile

drivers/block/mvsata_ide.c

include/configs/ap325rxa.h

include/configs/edminiv2.h

include/configs/ms7720se.h

include/configs/openrd_base.h

include/configs/r2dplus.h

include/configs/r7780mp.h