From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Wed, 20 Aug 2008 07:37:09 +0000 (+0200)
Subject: Merge branch 'next' of git://git.denx.de/u-boot-avr32
X-Git-Tag: v2008.10-rc1~152^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96;p=u-boot

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

Conflicts:

	MAINTAINERS
---

d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96