Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 21 Jul 2016 14:40:35 +0000 (10:40 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 21 Jul 2016 14:40:35 +0000 (10:40 -0400)
commit45031f1a1e575bf2e5ceb3e6e9f5b8b09f4945a1
treef54c93c5b98014d59d28bffe5e4c5b6ce1e96621
parent55edb9d4d521ff733d217ddf47ad7bf4650676be
parent747431b9d54d3ebdef87352006218ed948011612
Merge branch 'master' of git://git.denx.de/u-boot-sh