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

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 22 Dec 2012 10:59:14 +0000 (11:59 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 22 Dec 2012 10:59:14 +0000 (11:59 +0100)
commit	96764df1b47ddebfb50fadf5af72530b07b5fc89
tree	275ae1bea499538936ddd4159910ea95ecfb86c0	tree \| snapshot
parent	b8a7c467960ffb4d5a5e1eef5f7783fb6f594542	commit \| diff
parent	fbef8e6e7f1233ed20f8c5045e12c9cf31b43540	commit \| diff
parent	b874df74afc986b069738b180763f2464ac3f5f4	commit \| diff
parent	a098cf41fdb2a6607c675f7fe4f3164617c9367e	commit \| diff

Merge samsung, imx, tegra into u-boot-arm/master

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.

Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/cpu/armv7/exynos/clock.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/cpu/armv7/exynos/pinmux.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/configs/smdk5250.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history