Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Tue, 24 May 2016 12:55:06 +0000 (14:55 +0200)
committerStefano Babic <sbabic@denx.de>
Tue, 24 May 2016 12:55:06 +0000 (14:55 +0200)

Trivial merge