Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 27 Oct 2009 19:56:31 +0000 (20:56 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Oct 2009 19:56:31 +0000 (20:56 +0100)

Trivial merge