| commit | cf81306a2d54b897ca9ca30382eacb3a36449fba | |
| author | Michel Pollet <buserror@gmail.com> | |
| Thu, 5 Feb 2009 19:55:25 +0000 (5 19:55 +0000) | ||
| committer | Michel Pollet <buserror@gmail.com> | |
| Thu, 5 Feb 2009 19:55:25 +0000 (5 19:55 +0000) | ||
| tree | baa99246eaba5729728d0b69a05153a8a9974037 | treesnapshot (tar.gz zip) |
| parent | 3dbe946fbeb26c9317f1c178135e6ce178bf3332 | commitdiff |
| parent | 3481782476680c19a63dbd3a10fdc78d8ebad60b | commitdiff |
Merge branch 'dev-mini2440-staging' into dev-mini2440-buserror
Conflicts:
board/mini2440/flash.c
board/mini2440/mini2440.c
include/configs/mini2440.h
Conflicts:
board/mini2440/flash.c
board/mini2440/mini2440.c
include/configs/mini2440.h