Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Thu, 20 Nov 2014 04:18:19 +0000 (23:18 -0500)
committerTom Rini <trini@ti.com>
Thu, 20 Nov 2014 04:18:19 +0000 (23:18 -0500)

Trivial merge