Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 10 Mar 2009 21:04:04 +0000 (22:04 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 10 Mar 2009 21:04:04 +0000 (22:04 +0100)

Trivial merge