Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Fri, 23 Jan 2009 21:47:25 +0000 (22:47 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 23 Jan 2009 21:47:25 +0000 (22:47 +0100)

Trivial merge