Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 18 Aug 2009 11:57:04 +0000 (13:57 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 18 Aug 2009 11:57:04 +0000 (13:57 +0200)

Trivial merge