Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <[email protected]>
Fri, 17 Jul 2015 09:22:56 +0000 (11:22 +0200)
committerStefano Babic <[email protected]>
Fri, 17 Jul 2015 09:22:56 +0000 (11:22 +0200)

Trivial merge