Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 18 Oct 2007 20:02:35 +0000 (22:02 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 18 Oct 2007 20:02:35 +0000 (22:02 +0200)

Trivial merge