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)
commit8a1239e74cdf4d94738eb71928769d6e78bcc78c
tree09894015fe34a93ad6cd7c7f79ef592ab2cf6179
parent2271e7c6e8eef883b834fb7d07911848a54fde13
parent4ef806794a165252d69c519d868a746e4cfa9729
Merge branch 'master' of git://git.denx.de/u-boot-nds32

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