Merge branch 'master' of git://www.denx.de/git/u-boot-mpc5xxx
authorWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 01:00:17 +0000 (02:00 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 01:00:17 +0000 (02:00 +0100)

Trivial merge