Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 27 Aug 2008 22:26:52 +0000 (00:26 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 27 Aug 2008 22:26:52 +0000 (00:26 +0200)

Trivial merge