Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Tue, 26 Jan 2010 21:32:38 +0000 (22:32 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Jan 2010 21:32:38 +0000 (22:32 +0100)

Trivial merge