Stefan Roese f2302d4430 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:05:38 +02:00
..
config.mk	ColdFire: Added M5275EVB support.	2008-03-31 15:10:11 -06:00
m5275evb.c	Change initdram() return type to phys_size_t	2008-06-12 08:50:18 +02:00
Makefile	Fix merge problems	2008-08-06 14:05:38 +02:00
mii.c	Coding Style cleanup; update CHANGELOG	2008-04-13 09:59:26 -07:00
u-boot.lds	Big white-space cleanup.	2008-05-21 00:14:08 +02:00