Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Thu, 9 Dec 2010 19:52:44 +0000 (20:52 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 9 Dec 2010 19:52:44 +0000 (20:52 +0100)

Trivial merge