Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 26 Feb 2014 21:49:58 +0000 (16:49 -0500)
committerTom Rini <trini@ti.com>
Wed, 26 Feb 2014 21:49:58 +0000 (16:49 -0500)
commiteeb72e67619b98d2502fe634a3a5d9953de92ad0
treeedea4b04062ec956158c163b13c9a31fcfdccde8
parent715b56fe2b47e073e6f2425e0cedba0e92a4014d
parent1551df35f296f0a8df32f4f2054254f46e8be252
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>
README
arch/arm/cpu/armv7/am33xx/clock_am43xx.c
arch/arm/cpu/armv7/config.mk
arch/arm/include/asm/arch-am33xx/cpu.h
arch/arm/lib/board.c
board/ti/am43xx/mux.c
boards.cfg
common/Makefile
common/board_f.c
common/cmd_pxe.c
include/configs/am43xx_evm.h