Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Mon, 20 Jan 2014 12:51:22 +0000 (07:51 -0500)
committerTom Rini <trini@ti.com>
Mon, 20 Jan 2014 12:51:22 +0000 (07:51 -0500)

Trivial merge