u-boot/board/phytec
Albert ARIBAUD f15ea6e1d6 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
2013-12-10 22:23:59 +01:00
..
pcm030 board: powerpc: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
pcm051 Merge branch 'u-boot/master' into 'u-boot-arm/master' 2013-12-10 22:23:59 +01:00