Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git...
authorTom Rini <trini@konsulko.com>
Thu, 21 Jan 2016 14:12:22 +0000 (09:12 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 21 Jan 2016 14:12:22 +0000 (09:12 -0500)
commit45fe3809b9923b92f221d70eb45ae071059fd5e0
tree3fef5d23f6fcc53e06c79eaed76fcaa13a0b12b9
parent9d0826879e13e8139a7b169c2365225e848ff57e
parentb19cc6bf2160e09607e141fe0fc571701070d1d6
Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git.denx.de/u-boot-nds32