Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git...
authorTom Rini <trini@konsulko.com>
Thu, 21 Jan 2016 14:12:22 +0000 (09:12 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 21 Jan 2016 14:12:22 +0000 (09:12 -0500)

Trivial merge