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

Trivial merge