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

author Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)

committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
author Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
committer	Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
	Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history