tree 57d78f1ee94a2060eaa591533278d2934d4f1da3
parent 5be325724459db11180b0ccc91eda0cef85aa72d
parent ca3cd8217caaede6ad1d6575f8ccb315b884aa9b
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1386682316 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1386710639 +0100

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