Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@ti.com>
Tue, 30 Apr 2013 13:58:28 +0000 (09:58 -0400)
committerTom Rini <trini@ti.com>
Wed, 1 May 2013 14:37:35 +0000 (10:37 -0400)

Trivial merge