Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:38:13 +0000 (09:38 -0700)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:38:13 +0000 (09:38 -0700)

Trivial merge