Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:49:09 +0000 (22:49 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:49:09 +0000 (22:49 +0200)

Trivial merge