Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 11 Nov 2009 21:58:30 +0000 (22:58 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Nov 2009 21:58:30 +0000 (22:58 +0100)

Trivial merge