Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Wed, 30 Sep 2009 21:22:46 +0000 (23:22 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 30 Sep 2009 21:22:46 +0000 (23:22 +0200)

Trivial merge