| commit | 32e2675504bcff1d1cdcaba3d946b4ef1501dc33 | [log] [tgz] |
|---|---|---|
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Mon Feb 23 10:34:39 2009 +0100 |
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Mon Feb 23 10:34:39 2009 +0100 |
| tree | eba5714fefee9dfcc0cc797ad0aeceaadc04c407 | |
| parent | 5691abf217c28678b87b954b57aa84dabe6e2ffc [diff] | |
| parent | 6685bf1a11033faca0aa690868d104ba01f9ab04 [diff] |
Merge branch 'mimc200' into next Conflicts: board/mimc/mimc200/mimc200.c include/configs/mimc200.h