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

Conflicts:
	include/configs/km_arm.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc Makefile
Simple merge

diff --cc arch/arm/cpu/arm926ejs/kirkwood/dram.c
Simple merge

diff --cc board/keymile/km_arm/km_arm.c
Simple merge

diff --cc include/configs/km_arm.h
Simple merge

diff --cc include/configs/mv-common.h
Simple merge