Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 19:50:24 +0000 (21:50 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 19:50:24 +0000 (21:50 +0200)

Trivial merge