Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Sat, 24 Apr 2010 19:13:31 +0000 (21:13 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Apr 2010 19:13:31 +0000 (21:13 +0200)

Trivial merge