tree 136d8161c0a68034b2f08e7c488533dabfb583b5
parent cec487a435ac106d1a611feba1a36043142c839b
parent 4eb29cf043afb36b414482c117413a8ff8f00410
author Wolfgang Denk <wd@denx.de> 1330291060 +0100
committer Wolfgang Denk <wd@denx.de> 1330291060 +0100

Merge branch 'master' of git://git.denx.de/u-boot-microblaze

* 'master' of git://git.denx.de/u-boot-microblaze:
  microblaze: Enable TFTP put command
  microblaze: avoid interrupt race conditions
  microblaze: fix build failure due to undefined reference to `get_ticks'