Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 11:42:06 +0000 (07:42 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 11:42:06 +0000 (07:42 -0400)

Trivial merge