u-boot-brain/arch/arm/include
Tom Rini eeb72e6761 Merge branch 'master' of git://git.denx.de/u-boot-arm
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>
2014-02-26 16:49:58 -05:00
..
asm Merge branch 'master' of git://git.denx.de/u-boot-arm 2014-02-26 16:49:58 -05:00