Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Wed, 29 Jul 2009 07:15:36 +0000 (09:15 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 29 Jul 2009 07:15:36 +0000 (09:15 +0200)

Trivial merge