u-boot/arch/arm/include
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
..
asm Merge branch 'master' of git://git.denx.de/u-boot-imx 2010-10-19 20:58:16 +02:00