git.librecmc.org Git - oweals/u-boot.git/commit

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 48b3ed2 434f2cf)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 28 Jul 2014 10:26:21 +0000 (12:26 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Mon, 28 Jul 2014 10:26:21 +0000 (12:26 +0200)
commit	b1cdd8baa14f518288ceddb391d6587c1ecb3174
tree	c3d00b3193b2ee86b9679baf1933b10a7d07a13d	tree \| snapshot
parent	48b3ed217f58487c583d59575d7dfe2aafbb738d	commit \| diff
parent	434f2cfcad9f70231ad5a096325ba72ef0d2a2cc	commit \| diff

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

Makefile	diff1 \|	diff2 \|	blob \| history
board/ti/am43xx/board.c	diff1 \|	diff2 \|	blob \| history
board/ti/dra7xx/evm.c	diff1 \|	diff2 \|	blob \| history
board/ti/dra7xx/mux_data.h	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	diff1 \|	diff2 \|	blob \| history
include/configs/nokia_rx51.h	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.