Merge branch 'master' of git://git.denx.de/u-boot into master
authorStefano Babic <sbabic@denx.de>
Tue, 18 Sep 2018 14:53:34 +0000 (16:53 +0200)
committerStefano Babic <sbabic@denx.de>
Tue, 18 Sep 2018 14:53:55 +0000 (16:53 +0200)
Signed-off-by: Stefano Babic <sbabic@denx.de>

Trivial merge