Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 21 Oct 2008 19:19:35 +0000 (21:19 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 21 Oct 2008 19:19:35 +0000 (21:19 +0200)

Trivial merge