Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Fri, 23 Oct 2015 10:35:42 +0000 (12:35 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 23 Oct 2015 10:35:42 +0000 (12:35 +0200)

Trivial merge