Merge branch 'master' of git://git.denx.de/u-boot-imx
authorStefano Babic <sbabic@denx.de>
Thu, 18 May 2017 09:53:27 +0000 (11:53 +0200)
committerStefano Babic <sbabic@denx.de>
Thu, 18 May 2017 09:53:55 +0000 (11:53 +0200)
Signed-off-by: Stefano Babic <sbabic@denx.de>

Trivial merge