Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:52:29 +0000 (21:52 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:52:29 +0000 (21:52 +0200)

Trivial merge