Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 12 Oct 2008 21:12:44 +0000 (23:12 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 12 Oct 2008 21:12:44 +0000 (23:12 +0200)

Trivial merge