Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorDetlev Zundel <dzu@denx.de>
Mon, 30 Jun 2008 13:35:34 +0000 (15:35 +0200)
committerDetlev Zundel <dzu@denx.de>
Mon, 30 Jun 2008 13:38:24 +0000 (15:38 +0200)

Trivial merge