Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 20:03:00 +0000 (22:03 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 20:03:00 +0000 (22:03 +0200)
Conflicts:
include/configs/km_arm.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
1  2 
Makefile
arch/arm/cpu/arm926ejs/kirkwood/dram.c
board/keymile/km_arm/km_arm.c
include/configs/km_arm.h
include/configs/mv-common.h

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge