Merge branch 'master' of git://git.denx.de/u-boot-arm

author Wolfgang Denk <wd@denx.de>

Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)

committer Wolfgang Denk <wd@denx.de>

Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)
author Wolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)
committer Wolfgang Denk <wd@denx.de>
Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc drivers/net/at91_emac.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 13 Oct 2010 18:59:47 +0000 (20:59 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/at91_emac.c	patch \|	diff1 \|	diff2 \|	blob \| history