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

author Tom Rini <trini@konsulko.com>

Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
diff --cc drivers/ata/Kconfig
Simple merge
diff --cc include/configs/sunxi-common.h
Simple merge
diff --cc scripts/config_whitelist.txt
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 17 Apr 2019 13:19:45 +0000 (09:19 -0400)
		1	2
drivers/ata/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/sunxi-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/config_whitelist.txt	patch \|	diff1 \|	diff2 \|	blob \| history