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
..
2014-01-13 08:17:51 +01:00
2014-02-22 19:30:39 +01:00
2014-02-22 19:30:39 +01:00
2013-10-17 07:20:24 +02:00