Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 12:15:45 +0000 (13:15 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 8 Jan 2013 12:15:45 +0000 (13:15 +0100)
commit79f38777947ac7685e2cef8bd977f954ab198c0e
tree6fe053ef751b1c424ec50be338844197b6421d74
parent96764df1b47ddebfb50fadf5af72530b07b5fc89
parent9bd5c1ad0db802c9f8d49d72b443f03431cf6a89
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
14 files changed:
arch/arm/cpu/armv7/am33xx/board.c
arch/arm/cpu/armv7/am33xx/clock.c
arch/arm/include/asm/arch-am33xx/cpu.h
arch/arm/include/asm/arch-am33xx/hardware.h
board/ti/am335x/board.c
board/ti/beagle/beagle.c
drivers/i2c/omap24xx_i2c.c
drivers/mtd/nand/Makefile
include/configs/am335x_evm.h
include/configs/igep00x0.h
include/configs/mcx.h
include/configs/omap3_beagle.h
include/configs/tam3517-common.h
include/configs/tricorder.h