| commit | 77bd367940fab82676fffd7348ab46dac3080196 | [log] [tgz] |
|---|---|---|
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Dec 17 16:53:07 2008 +0100 |
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Dec 17 16:53:07 2008 +0100 |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc | |
| parent | fd077f2b99390a2b601bf0ec9f84d4342c0b29a0 [diff] | |
| parent | fcc369c4a819d1ddcd92ceb7fee2fa09f4e8edb3 [diff] |
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