Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 15 Nov 2009 21:48:02 +0000 (22:48 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 15 Nov 2009 21:48:02 +0000 (22:48 +0100)

Trivial merge