Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Tue, 5 Mar 2013 13:37:31 +0000 (14:37 +0100)
committerStefano Babic <sbabic@denx.de>
Tue, 5 Mar 2013 13:37:31 +0000 (14:37 +0100)

Trivial merge