Tom Rini 711b534120 Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	include/configs/ls1021aqds.h
	include/configs/ls1021atwr.h
2016-10-12 08:29:42 -04:00
..
2014-01-09 16:08:44 +01:00
2016-03-15 21:30:10 -04:00
2016-07-21 09:31:30 -07:00
2015-03-24 10:50:50 -04:00
2016-03-15 18:03:10 -04:00