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

author Tom Rini <trini@konsulko.com>

Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)

committer Tom Rini <trini@konsulko.com>

Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)
author Tom Rini <trini@konsulko.com>
Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)
committer Tom Rini <trini@konsulko.com>
Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)
diff --cc include/fdtdec.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)
committer	Tom Rini <trini@konsulko.com>
	Mon, 11 Feb 2019 16:15:34 +0000 (11:15 -0500)
		1	2
include/fdtdec.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history