Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 13:23:20 +0000 (15:23 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 13:23:20 +0000 (15:23 +0200)

Trivial merge