Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Apr 2013 20:07:57 +0000 (22:07 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Apr 2013 20:07:57 +0000 (22:07 +0200)
commit18122019972ca639ee3b581257e3a63ff7c8efeb
tree52f7223e7c63f43322f3eee4722743e12190a19f
parent90639feaa0d66a204f9d03a325ab14e2f97f6cbb
parent785881f775252940185e10fbb2d5299c9ffa6bce
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
drivers/video/exynos_fb.c
Makefile
README
drivers/mtd/nand/mxc_nand.c
drivers/video/exynos_fb.c
include/configs/am335x_evm.h
include/lcd.h