Stefan Roese f2302d4430 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:05:38 +02:00
..
acadia	Remove shell variable UNDEF_SYM.	2008-06-03 20:36:18 +02:00
bamboo	Change initdram() return type to phys_size_t	2008-06-12 08:50:18 +02:00
canyonlands	Change initdram() return type to phys_size_t	2008-06-12 08:50:18 +02:00
kilauea	Fix merge problems	2008-08-06 14:05:38 +02:00
sequoia	Remove shell variable UNDEF_SYM.	2008-06-03 20:36:18 +02:00