Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Mon, 10 Nov 2014 14:20:52 +0000 (09:20 -0500)
committerTom Rini <trini@ti.com>
Mon, 10 Nov 2014 21:25:29 +0000 (16:25 -0500)

Trivial merge