Merge git://www.denx.de/git/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Mon, 5 Dec 2016 16:02:01 +0000 (11:02 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 5 Dec 2016 16:02:01 +0000 (11:02 -0500)

Trivial merge