Stefan Roese f2302d4430 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:05:38 +02:00
..
Makefile	ColdFire: idmr platform MCF52x2 update	2007-08-16 17:43:20 -06:00
config.mk	Preliminary support for the iDMR board (ColdFire).	2006-12-20 00:27:32 +01:00
flash.c	[iDMR] Flash driver on initialisation write-protects some sectors,	2007-01-23 14:21:14 +01:00
idmr.c	Change initdram() return type to phys_size_t	2008-06-12 08:50:18 +02:00
mii.c	Fix merge problems	2008-08-06 14:05:38 +02:00
u-boot.lds	Big white-space cleanup.	2008-05-21 00:14:08 +02:00