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

Conflicts:

	MAINTAINERS