Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 12 Feb 2009 07:36:52 +0000 (08:36 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 12 Feb 2009 07:36:52 +0000 (08:36 +0100)

Trivial merge