Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Mon, 15 Jun 2015 10:08:11 +0000 (12:08 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 15 Jun 2015 10:08:11 +0000 (12:08 +0200)

Trivial merge