Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 11 Sep 2013 07:59:27 +0000 (09:59 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 11 Sep 2013 07:59:27 +0000 (09:59 +0200)
commit5480ac32171ab0e38c48c9f585fa650c7867f6a1
tree6672a47e3675e7e79fd0fbf9b491045230b24eed
parent68e1747f9c0506159e8ecc9a4feb58e9c65a7b39
parent5c18a1cf3e56e0177388258696be4a17a672e9d0
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
tools/Makefile
MAINTAINERS
Makefile
board/samsung/goni/goni.c
boards.cfg
include/configs/exynos5250-dt.h
tools/Makefile