tree 3f7685842824cbd42c290d575d39a7dd3d01bccd
parent b485556be51d1edae0a2c0065e2f572ca42a1eee
parent b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c
author Wolfgang Denk <wd@denx.de> 1287514696 +0200
committer Wolfgang Denk <wd@denx.de> 1287514696 +0200

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

Conflicts:
	board/logicpd/imx31_litekit/config.mk
	boards.cfg

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