Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Fri, 13 Feb 2015 10:17:01 +0000 (11:17 +0100)
committerStefano Babic <sbabic@denx.de>
Fri, 13 Feb 2015 10:17:01 +0000 (11:17 +0100)

Trivial merge