Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sat, 4 Apr 2009 18:05:18 +0000 (20:05 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 4 Apr 2009 18:05:18 +0000 (20:05 +0200)

Trivial merge