]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cec487a 4eb29cf)
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)
* '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'


Trivial merge
Cloned from git://git.denx.de/u-boot.git