u-boot/board/samsung
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
..
arndale usb: exynos5: arndale: Add network support 2014-01-13 12:23:28 +01:00
common Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
goni arm: remove unneeded symbol offsets and _TEXT_BASE 2014-02-26 21:18:12 +01:00
origen board:origen: Enable device tree on Origen 2014-03-12 19:55:00 +09:00
smdk2410 arm: remove unneeded symbol offsets and _TEXT_BASE 2014-02-26 21:18:12 +01:00
smdk5250 Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-03-25 10:53:15 +01:00
smdk5420 board:samsung: move checkboard to common file 2014-03-12 19:54:59 +09:00
smdkc100 arm: remove unneeded symbol offsets and _TEXT_BASE 2014-02-26 21:18:12 +01:00
smdkv310 kbuild: add dummy obj-y to create built-in.o 2014-02-19 11:07:50 -05:00
trats board:trats: Enable device tree on Trats 2014-03-12 19:55:00 +09:00
trats2 board:trats2: Enable device tree on Trats2 2014-03-12 19:55:00 +09:00
universal_c210 board:universal: Enable device tree on Universal 2014-03-12 19:55:00 +09:00