Merge branch 'master' of git://git.denx.de/u-boot-pmic
authorTom Rini <trini@konsulko.com>
Fri, 14 Aug 2015 15:37:48 +0000 (11:37 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 14 Aug 2015 20:27:11 +0000 (16:27 -0400)

Trivial merge