Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 16 Jan 2009 08:17:53 +0000 (09:17 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 16 Jan 2009 08:17:53 +0000 (09:17 +0100)

Trivial merge