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)
commit0c0892be0d93a5a892b93739c5eb3bf692fed4ff
treea046b11024bdf0a41082647c95df23a10cb206fc
parentd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f
parent28e57108a61bd0e554d9847170b8ad9dad093e07
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>
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