git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 65b7fe2 f15ea6e)

author	Tom Rini <trini@ti.com>
	Tue, 10 Dec 2013 22:15:18 +0000 (17:15 -0500)
committer	Tom Rini <trini@ti.com>
	Tue, 10 Dec 2013 22:15:18 +0000 (17:15 -0500)
commit	4b210ad34282bfd9fc982a8e3c9a9126f4094cdb
tree	f91ebdc46ede952728602d5ecc18e64ad0e52682	tree \| snapshot
parent	65b7fe28a12bbaccc7a0c076f5f9f213150030e7	commit \| diff
parent	f15ea6e1d67782a1626d4a4922b6c20e380085e5	commit \| diff

Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>

Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
board/samsung/trats/trats.c	diff1 \|	diff2 \|	blob \| history
board/samsung/trats2/trats2.c	diff1 \|	diff2 \|	blob \| history
include/configs/arndale.h	diff1 \|	diff2 \|	blob \| history
include/configs/exynos5250-dt.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats2.h	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git