u-boot/board/samsung/smdk5250
Albert ARIBAUD ab6423cae0 Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c
2014-03-25 10:53:15 +01:00
..
exynos5-dt.c Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
Makefile board: arm: convert makefiles to Kbuild style 2013-11-01 11:42:12 -04:00
smdk5250.c board:samsung:common: move max77686 init function 2014-03-12 19:55:00 +09:00
smdk5250_spl.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00