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
..
2014-03-12 17:04:57 -04:00
2014-02-26 21:18:09 +01:00
2014-01-24 16:59:07 -05:00
2014-01-24 16:59:07 -05:00
2014-02-19 11:07:50 -05:00
2014-03-10 13:50:31 -04:00
2014-02-21 13:55:41 -05:00
2014-03-12 17:04:55 -04:00
2013-11-26 21:49:34 +01:00
2014-01-24 16:59:07 -05:00
2014-03-12 17:04:55 -04:00
2014-01-07 16:41:12 -05:00
2014-02-19 11:07:50 -05:00
2014-03-17 20:05:49 -06:00
2014-01-24 16:59:07 -05:00
2014-02-26 21:18:09 +01:00
2014-01-24 16:59:07 -05:00
2014-03-12 17:04:57 -04:00