Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Sun, 26 Jan 2014 11:11:54 +0000 (12:11 +0100)
committerStefano Babic <sbabic@denx.de>
Sun, 26 Jan 2014 11:11:54 +0000 (12:11 +0100)

Trivial merge