]> git.ipfire.org Git - people/ms/u-boot.git/commit
Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 10 Dec 2013 13:31:56 +0000 (14:31 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 10 Dec 2013 21:23:59 +0000 (22:23 +0100)
commitf15ea6e1d67782a1626d4a4922b6c20e380085e5
tree57d78f1ee94a2060eaa591533278d2934d4f1da3
parentcb7ee1b98cac6baf244daefb1192adf5a47bc983
parentf44483b57c49282299da0e5c10073b909cdad979
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
24 files changed:
Makefile
README
arch/arm/cpu/armv7/omap-common/Makefile
arch/arm/cpu/armv7/omap3/clock.c
arch/arm/cpu/armv7/rmobile/Makefile
board/actux1/u-boot.lds
board/actux2/u-boot.lds
board/actux3/u-boot.lds
board/atmel/sama5d3xek/sama5d3xek.c
board/compulab/cm_t335/u-boot.lds
board/dvlhost/u-boot.lds
board/freescale/mx31ads/u-boot.lds
board/phytec/pcm051/board.c
board/ti/am335x/board.c
board/ti/am335x/u-boot.lds
board/vpac270/u-boot-spl.lds
boards.cfg
doc/README.scrapyard
drivers/mtd/nand/atmel_nand.c
include/configs/am335x_evm.h
include/configs/am3517_evm.h
include/configs/cm_t35.h
include/configs/omap3_beagle.h
include/configs/siemens-am33x-common.h