Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <[email protected]>
Fri, 9 Nov 2012 15:47:25 +0000 (08:47 -0700)
committerTom Rini <[email protected]>
Fri, 9 Nov 2012 15:47:25 +0000 (08:47 -0700)

Trivial merge