Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Tue, 26 Jul 2016 12:29:30 +0000 (08:29 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 26 Jul 2016 12:29:30 +0000 (08:29 -0400)

Trivial merge