Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:48:01 +0000 (20:48 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:48:01 +0000 (20:48 +0200)

Trivial merge