Stefan Roese 9caeaadf50 Merge commit 'u-boot/master' into for-1.3.1 ... Conflicts: drivers/rtc/Makefile		2007-12-11 11:34:54 +01:00
..
config.mk	[ppc4xx] Fix problem with NAND booting on AMCC Acadia	2007-06-19 16:42:31 +02:00
Makefile	Merge commit 'u-boot/master' into for-1.3.1	2007-12-11 11:34:54 +01:00
u-boot.lds	[ppc4xx] Fix problem with NAND booting on AMCC Acadia	2007-06-19 16:42:31 +02:00