Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Mon, 19 May 2008 07:42:38 +0000 (09:42 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 19 May 2008 07:42:38 +0000 (09:42 +0200)

Trivial merge