Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 22 Aug 2008 22:10:43 +0000 (00:10 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 22 Aug 2008 22:10:43 +0000 (00:10 +0200)

Trivial merge