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

author Tom Rini <trini@konsulko.com>

Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)

committer Tom Rini <trini@konsulko.com>

Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
author Tom Rini <trini@konsulko.com>
Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
committer Tom Rini <trini@konsulko.com>
Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
diff --cc Kconfig
Simple merge
diff --cc include/configs/am335x_evm.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
committer	Tom Rini <trini@konsulko.com>
	Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
		1	2
Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history