Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 18 Feb 2009 23:50:08 +0000 (00:50 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 18 Feb 2009 23:50:08 +0000 (00:50 +0100)

Trivial merge