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

Trivial merge