Merge branch 'next' of git://git.denx.de/u-boot-nios

author Wolfgang Denk <wd@denx.de>

Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc boards.cfg
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 14 Jul 2010 20:07:41 +0000 (22:07 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history