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> |
||
---|---|---|
.. | ||
config.mk | ||
emif.c | ||
hw_data.c | ||
hwinit.c | ||
Makefile | ||
prcm-regs.c | ||
sdram_elpida.c |
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> |
||
---|---|---|
.. | ||
config.mk | ||
emif.c | ||
hw_data.c | ||
hwinit.c | ||
Makefile | ||
prcm-regs.c | ||
sdram_elpida.c |