Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <trini@konsulko.com>
Wed, 18 Mar 2015 11:07:36 +0000 (07:07 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 18 Mar 2015 11:07:36 +0000 (07:07 -0400)

Trivial merge