Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 24 Oct 2009 20:25:08 +0000 (22:25 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Oct 2009 20:25:08 +0000 (22:25 +0200)

Trivial merge