[U-Boot] Merge conflicts between ARM and mainline U-Boot trees

[Lukasz Majewski]

Hi Albert,


> 
> 	include/configs/trats.h:
> 	- commits fe601647 (Piotr) and 9960d9a8 (Lukasz)
> 	- note: I manually removed CONFIG_EFI_PARTITION and
> 	  CONFIG_PARTITION_UUIDS which are already defined in
> 	  include/configs/exynos4-dt.h
> 

I can confirm that Albert's solution provided at u-boot-denx-arm/merged
works at Samsung's Trats device.

Acked-by:  Lukasz Majewski <l.majewski at samsung.com>
Tested-by: Lukasz Majewski <l.majewski at samsung.com>

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group