Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 26 Jul 2009 20:54:23 +0000 (22:54 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 26 Jul 2009 20:54:23 +0000 (22:54 +0200)

Trivial merge