Merge branch 'master' of git://git.denx.de/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Sun, 26 Feb 2012 21:17:40 +0000 (22:17 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 26 Feb 2012 21:17:40 +0000 (22:17 +0100)
commit54e96680cb96fb7a4b8f43fd949c62054004d3e5
tree136d8161c0a68034b2f08e7c488533dabfb583b5
parentcec487a435ac106d1a611feba1a36043142c839b
parent4eb29cf043afb36b414482c117413a8ff8f00410
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'