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
..
Makefile	samsung: common: Add file for common functions, draw_logo() cleanup.	2014-02-03 15:36:14 +09:00
board.c	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2014-03-25 10:53:15 +01:00
dfu_sample_env.txt	config: trats: trats2: extend dfu_alt_info by env update settings	2014-02-03 16:09:10 +09:00
exynos-uboot-spl.lds	arm: make _end compiler-generated	2014-02-26 21:18:09 +01:00
misc.c	sizes.h - consolidate for all architectures	2014-03-04 12:15:01 -05:00
multi_i2c.c	samsung:common:i2c: add definions for third soft I2C adapter for Trats2 board	2013-09-25 10:52:33 +09:00
thor.c	samsung:common:thor: Define common Samsung code to handle THOR usb descriptor setup	2013-10-20 23:42:41 +02:00
ums.c	usb: ums: move ums code from trats to Samsung common directory	2013-11-08 20:46:19 +01:00