Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Fri, 30 Oct 2015 13:52:51 +0000 (14:52 +0100)
committerStefano Babic <sbabic@denx.de>
Fri, 30 Oct 2015 13:52:51 +0000 (14:52 +0100)

Trivial merge