| commit | 34a7481dcf55ef85384929ada05c0c81b509cb8c | |
| author | Michel Pollet <buserror@gmail.com> | |
| Wed, 20 May 2009 13:22:53 +0000 (20 14:22 +0100) | ||
| committer | Michel Pollet <buserror@gmail.com> | |
| Wed, 20 May 2009 13:22:53 +0000 (20 14:22 +0100) | ||
| tree | 9c6ceb555ccce342c2cc34a6ad506ad723b31277 | treesnapshot (tar.gz zip) |
| parent | 4001124d32bfba695e1154c4a3435f99d8c5c051 | commitdiff |
| parent | 3a8bae3e057a775070b5da887ce506a5f9ec6139 | commitdiff |
Merge commit 'origin/master' into dev-mini2440-stable
Conflicts:
Makefile.target
hw/boards.h
hw/flash.h
target-arm/machine.c
Conflicts:
Makefile.target
hw/boards.h
hw/flash.h
target-arm/machine.c
| Makefile.target | diff1 | diff2 | blobhistory |
| hw/boards.h | diff1 | diff2 | blobhistory |
| hw/flash.h | diff1 | diff2 | blobhistory |
| hw/nand.c | diff1 | diff2 | blobhistory |
| target-arm/machine.c | diff1 | diff2 | blobhistory |