Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Tue, 20 Dec 2016 13:41:54 +0000 (08:41 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 20 Dec 2016 13:41:54 +0000 (08:41 -0500)

Trivial merge