Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Mon, 9 Sep 2013 13:35:38 +0000 (09:35 -0400)
committerTom Rini <trini@ti.com>
Mon, 9 Sep 2013 13:35:38 +0000 (09:35 -0400)

Trivial merge