tree a046b11024bdf0a41082647c95df23a10cb206fc
parent d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f
parent 28e57108a61bd0e554d9847170b8ad9dad093e07
author Wolfgang Denk <wd@denx.de> 1288382580 +0200
committer Wolfgang Denk <wd@denx.de> 1288382580 +0200

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>