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
..
2009-04-28 00:36:21 +02:00
2009-04-04 22:44:22 +02:00
2009-04-04 22:44:22 +02:00
2013-02-28 19:09:23 -08:00
2014-02-21 11:33:19 -05:00