Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Tue, 11 Feb 2014 11:55:32 +0000 (12:55 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 11 Feb 2014 11:55:32 +0000 (12:55 +0100)

Trivial merge