Merge branch 'master' of git://www.denx.de/git/u-boot-imx

author Tom Rini <trini@konsulko.com>

Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)
diff --cc configs/mx7dsabresd_defconfig
Simple merge
diff --cc include/configs/mx6sabre_common.h
Simple merge
diff --cc include/configs/mx7dsabresd.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 13 Apr 2016 11:19:50 +0000 (07:19 -0400)
		1	2
configs/mx7dsabresd_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabre_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx7dsabresd.h	patch \|	diff1 \|	diff2 \|	blob \| history