commit f15ea6e1d67782a1626d4a4922b6c20e380085e5
author Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Dec 10 14:31:56 2013 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Dec 10 22:23:59 2013 +0100
tree 57d78f1ee94a2060eaa591533278d2934d4f1da3
parent cb7ee1b98cac6baf244daefb1192adf5a47bc983
parent f44483b57c49282299da0e5c10073b909cdad979

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds

board/compulab/cm_t335/u-boot.lds

diff --git a/board/compulab/cm_t335/u-boot.lds b/board/compulab/cm_t335/u-boot.lds
index 3bd96e9..1b609a2 100644
--- a/board/compulab/cm_t335/u-boot.lds
+++ b/board/compulab/cm_t335/u-boot.lds
@@ -19,7 +19,7 @@
 	{
 		*(.__image_copy_start)
 		CPUDIR/start.o (.text*)
-		board/compulab/cm_t335/libcm_t335.o (.text*)
+		board/compulab/cm_t335/built-in.o (.text*)
 		*(.text*)
 	}