Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 16 May 2019 11:09:18 +0000 (07:09 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 16 May 2019 11:09:18 +0000 (07:09 -0400)
commit9a32caf52d0dd8287d071eb6a0d93cacfea3fd17
tree7c744fd3aa0697b9870d2e34ca9e6881f781e7d4
parent5b4b680cfe29a67171ccbe439c66374cb31faca3
parent851224460f9ae673a9a9a3a57a573ad636d1301b
Merge branch 'master' of git://git.denx.de/u-boot-sh

- Align env position on GR-Peach with downstream U-Boot.