Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged
authorAllen Martin <amartin@nvidia.com>
Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
committerAllen Martin <amartin@nvidia.com>
Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
commita098cf41fdb2a6607c675f7fe4f3164617c9367e
treeb37acb36f65909e6f74cc537d73efd883a1485a6
parentb8a7c467960ffb4d5a5e1eef5f7783fb6f594542
parent095728803eedfce850a2f85828f79500cb09979e
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Conflicts:
README
arch/arm/cpu/armv7/exynos/clock.c
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
40 files changed:
MAINTAINERS
Makefile
README
arch/arm/cpu/armv7/exynos/clock.c
arch/arm/cpu/armv7/exynos/pinmux.c
arch/arm/include/asm/arch-exynos/cpu.h
board/freescale/mx35pdk/mx35pdk.c
board/samsung/trats/trats.c
board/samsung/universal_c210/universal.c
boards.cfg
common/Makefile
common/lcd.c
common/main.c
drivers/misc/Makefile
drivers/mmc/tegra_mmc.c
drivers/power/power_fsl.c
drivers/video/Makefile
include/configs/mx28evk.h
include/configs/mx31pdk.h
include/configs/mx35pdk.h
include/configs/mx51_efikamx.h
include/configs/mx51evk.h
include/configs/mx53evk.h
include/configs/mx53loco.h
include/configs/mx6qarm2.h
include/configs/mx6qsabre_common.h
include/configs/mx6qsabrelite.h
include/configs/s5pc210_universal.h
include/configs/seaboard.h
include/configs/smdk5250.h
include/configs/tegra-common-post.h
include/configs/tegra20-common.h
include/configs/trats.h
include/configs/ventana.h
include/configs/vision2.h
include/fdtdec.h
include/lcd.h
include/power/max8998_pmic.h
lib/fdtdec.c
spl/Makefile