Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorWolfgang Denk <wd@denx.de>
Mon, 30 Apr 2012 14:29:16 +0000 (16:29 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 30 Apr 2012 14:29:16 +0000 (16:29 +0200)
* 'master' of git://git.denx.de/u-boot-nds32:
  board/adp-ag102: add configuration of adp-ag102
  board/adp-ag102: add board specific files
  nds32/ag102: add ag102 soc support
  nds32/ag102: add header support of ag102 soc


Trivial merge