Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Mon, 7 Jul 2014 14:10:52 +0000 (10:10 -0400)
committerTom Rini <trini@ti.com>
Mon, 7 Jul 2014 14:10:52 +0000 (10:10 -0400)

Trivial merge