Stefan Roese f2302d4430 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:05:38 +02:00
..
Makefile	Fix merge problems	2008-08-06 14:05:38 +02:00
config.mk	ppc4xx: Change Kilauea to use the common DDR2 init function	2008-06-03 20:22:03 +02:00
u-boot.lds	ppc4xx: Change Kilauea to use the common DDR2 init function	2008-06-03 20:22:03 +02:00