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
..
2016-02-06 12:00:59 +01:00
2016-09-27 23:30:27 +02:00
2016-09-27 23:30:27 +02:00
2016-09-27 23:30:27 +02:00
2015-10-16 07:21:09 -04:00