Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Fri, 16 Dec 2016 08:53:52 +0000 (09:53 +0100)
committerStefano Babic <sbabic@denx.de>
Fri, 16 Dec 2016 08:53:52 +0000 (09:53 +0100)

Trivial merge