Wolfgang Denk 083d506937 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>		2010-10-19 20:58:16 +02:00
..
cpu	Merge branch 'master' of git://git.denx.de/u-boot-imx	2010-10-19 20:58:16 +02:00
include/asm	Merge branch 'master' of git://git.denx.de/u-boot-imx	2010-10-19 20:58:16 +02:00
lib	ARM: add flat device tree support	2010-10-18 22:54:00 +02:00
config.mk	ARM: add relocation support	2010-09-19 19:29:53 +02:00