Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Tue, 6 Aug 2013 13:49:06 +0000 (09:49 -0400)
committerTom Rini <trini@ti.com>
Tue, 6 Aug 2013 13:49:06 +0000 (09:49 -0400)

Trivial merge