Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Mon, 26 Jun 2017 19:48:05 +0000 (15:48 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 26 Jun 2017 19:48:05 +0000 (15:48 -0400)

Trivial merge