Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sun, 27 Mar 2011 19:20:29 +0000 (21:20 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 27 Mar 2011 19:20:29 +0000 (21:20 +0200)

Trivial merge