]> git.sur5r.net Git - u-boot/commit
Merge samsung, imx, tegra into u-boot-arm/master
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 22 Dec 2012 10:59:14 +0000 (11:59 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 22 Dec 2012 10:59:14 +0000 (11:59 +0100)
commit96764df1b47ddebfb50fadf5af72530b07b5fc89
tree275ae1bea499538936ddd4159910ea95ecfb86c0
parentb8a7c467960ffb4d5a5e1eef5f7783fb6f594542
parentfbef8e6e7f1233ed20f8c5045e12c9cf31b43540
parentb874df74afc986b069738b180763f2464ac3f5f4
parenta098cf41fdb2a6607c675f7fe4f3164617c9367e
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
arch/arm/cpu/armv7/exynos/clock.c
arch/arm/cpu/armv7/exynos/pinmux.c
include/configs/smdk5250.h