Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Mon, 22 Sep 2014 13:51:01 +0000 (15:51 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 22 Sep 2014 13:51:01 +0000 (15:51 +0200)

Trivial merge