Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Thu, 17 Oct 2013 16:09:49 +0000 (12:09 -0400)
committerTom Rini <trini@ti.com>
Thu, 17 Oct 2013 16:09:49 +0000 (12:09 -0400)

Trivial merge