-
git://git.denx.de/u-boot-armTom Rini authored
Conflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.h Signed-off-by:
Tom Rini <trini@ti.com>
eeb72e67
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by:
Tom Rini <trini@ti.com>