tree 8f4808d60917100b18a10b05230f7638a0a9bbcc
parent fd077f2b99390a2b601bf0ec9f84d4342c0b29a0
parent fcc369c4a819d1ddcd92ceb7fee2fa09f4e8edb3
author Haavard Skinnemoen <haavard.skinnemoen@atmel.com> 1229529187 +0100
committer Haavard Skinnemoen <haavard.skinnemoen@atmel.com> 1229529187 +0100

Merge branch 'fixes' into cleanups

Conflicts:

	board/atmel/atngw100/atngw100.c
	board/atmel/atstk1000/atstk1000.c
	cpu/at32ap/at32ap700x/gpio.c
	include/asm-avr32/arch-at32ap700x/clk.h
	include/configs/atngw100.h
	include/configs/atstk1002.h
	include/configs/atstk1003.h
	include/configs/atstk1004.h
	include/configs/atstk1006.h
	include/configs/favr-32-ezkit.h
	include/configs/hammerhead.h
	include/configs/mimc200.h