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
..
2015-02-25 07:59:50 +01:00
2016-07-15 15:54:57 +02:00
2015-04-16 11:27:15 +02:00
2015-09-28 10:48:24 -04:00