Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 20:57:43 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 20:57:43 +0000 (22:57 +0200)

Trivial merge