Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Fri, 1 Jul 2011 07:42:25 +0000 (09:42 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 1 Jul 2011 07:42:25 +0000 (09:42 +0200)
commit2c4ed7d2506621574284ee66da27ce88b7c21a06
tree64e66639eb3bfc5f313f93d0f0e153ca4923ada0
parent4c2105cb9fc6f2cd871ad6b5c3c1a0b116196804
parent4827d067dde99409c6e5b1c0bbbd8dff88db3cd5
Merge branch 'next' of git://git.denx.de/u-boot-nios

* 'next' of git://git.denx.de/u-boot-nios:
  nios2: move generic config to boards.cfg