Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Tue, 9 May 2017 13:13:59 +0000 (09:13 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 9 May 2017 13:13:59 +0000 (09:13 -0400)

Trivial merge