Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <[email protected]>
Mon, 20 Jul 2009 20:52:31 +0000 (22:52 +0200)
committerWolfgang Denk <[email protected]>
Mon, 20 Jul 2009 20:52:31 +0000 (22:52 +0200)

Trivial merge