git.openwrt.org Git - project/bcm63xx/u-boot.git/commit

projects / project / bcm63xx / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 715b56f 1551df3)

author	Tom Rini <trini@ti.com>
	Wed, 26 Feb 2014 21:49:58 +0000 (16:49 -0500)
committer	Tom Rini <trini@ti.com>
	Wed, 26 Feb 2014 21:49:58 +0000 (16:49 -0500)
commit	eeb72e67619b98d2502fe634a3a5d9953de92ad0
tree	edea4b04062ec956158c163b13c9a31fcfdccde8	tree \| snapshot
parent	715b56fe2b47e073e6f2425e0cedba0e92a4014d	commit \| diff
parent	1551df35f296f0a8df32f4f2054254f46e8be252	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/am33xx/clock_am43xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/config.mk	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-am33xx/cpu.h	diff1 \|	diff2 \|	blob \| history
arch/arm/lib/board.c	diff1 \|	diff2 \|	blob \| history
board/ti/am43xx/mux.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/board_f.c	diff1 \|	diff2 \|	blob \| history
common/cmd_pxe.c	diff1 \|	diff2 \|	blob \| history
include/configs/am43xx_evm.h	diff1 \|	diff2 \|	blob \| history

Broadcom-s U-Boot