Merge branch 'fixes' into cleanups
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 17 Dec 2008 15:53:07 +0000 (16:53 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 17 Dec 2008 15:53:07 +0000 (16:53 +0100)
commitcb5473205206c7f14cbb1e747f28ec75b48826e2
tree8f4808d60917100b18a10b05230f7638a0a9bbcc
parentbaf449fc5ff96f071bb0e3789fd3265f6d4fd9a0
parent92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb
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
17 files changed:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
board/mimc/mimc200/mimc200.c
board/miromico/hammerhead/hammerhead.c
cpu/at32ap/at32ap700x/clk.c
cpu/at32ap/cpu.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
lib_avr32/board.c