Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:09:02 +0000 (21:09 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:09:02 +0000 (21:09 +0100)

Trivial merge