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)
commitd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f
tree2bf529f0ee08c530a46def3d6d4727ccdcaef236
parent17dd883c5b76bdade0f7a48f2eb02d918a5ebef9
parent1ab027cbf6536f40348699a7b7bfa8bbedf88c8e
Merge branch 'master' of git://git.denx.de/u-boot-imx