Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Tue, 19 Oct 2010 18:58:16 +0000 (20:58 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 19 Oct 2010 18:58:16 +0000 (20:58 +0200)
commit083d506937002f2795c80fe0c3ae194ad2c3d085
tree3f7685842824cbd42c290d575d39a7dd3d01bccd
parentb485556be51d1edae0a2c0065e2f572ca42a1eee
parentb952c24adeb7bfdb09f60d5d1f49fa86a2686c1c
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>
board/logicpd/imx31_litekit/config.mk
boards.cfg