Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:34:30 +0000 (23:34 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:34:30 +0000 (23:34 +0200)

Trivial merge