Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:22:23 +0000 (22:22 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:22:23 +0000 (22:22 +0200)

Trivial merge