tree 4a31c8593505e06598eea72cc17806377eda919e
parent 7772c13ba07eaabd42499998f3713b23350fc119
parent 13b50fe3bc065c48911fa373231421280855a9d6
author Haavard Skinnemoen <haavard.skinnemoen@atmel.com> 1219216348 +0200
committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com> 1219216348 +0200

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

Conflicts:

	MAKEALL
	Makefile