Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Tue, 25 Mar 2008 23:44:32 +0000 (00:44 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Mar 2008 23:44:32 +0000 (00:44 +0100)

Trivial merge