From: Wolfgang Denk <wd@denx.de>
Date: Sat, 3 Mar 2012 14:13:41 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nds32
X-Git-Tag: v2012.04-rc1~99
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a1239e74cdf4d94738eb71928769d6e78bcc78c;p=oweals%2Fu-boot.git

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

8a1239e74cdf4d94738eb71928769d6e78bcc78c