]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2271e7c 4ef8067)
Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorWolfgang Denk <wd@denx.de>
Sat, 3 Mar 2012 14:13:41 +0000 (15:13 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 3 Mar 2012 14:13:41 +0000 (15:13 +0100)
* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/board.c: add PCI prompt at boot up
  nds32/ag101/watchdog.S: add linkage support
  nds32: add linkage support


Trivial merge
"Das U-Boot" Source Tree