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

Trivial merge