From: Wolfgang Denk <wd@denx.de>
Date: Sun, 26 Feb 2012 21:17:40 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-microblaze
X-Git-Tag: v2012.04-rc1~150
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54e96680cb96fb7a4b8f43fd949c62054004d3e5;p=oweals%2Fu-boot.git

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'
---

54e96680cb96fb7a4b8f43fd949c62054004d3e5