Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Tue, 20 Aug 2013 15:34:24 +0000 (11:34 -0400)
committerTom Rini <trini@ti.com>
Tue, 20 Aug 2013 15:34:24 +0000 (11:34 -0400)

Trivial merge