Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Thu, 15 Oct 2015 13:34:14 +0000 (15:34 +0200)
committerStefano Babic <sbabic@denx.de>
Thu, 15 Oct 2015 13:34:14 +0000 (15:34 +0200)

Trivial merge