Merge commit 'origin/master' into dev-mini2440-stable
authorMichel Pollet <buserror@gmail.com>
Wed, 20 May 2009 13:22:53 +0000 (14:22 +0100)
committerMichel Pollet <buserror@gmail.com>
Wed, 20 May 2009 13:22:53 +0000 (14:22 +0100)
commit34a7481dcf55ef85384929ada05c0c81b509cb8c
tree9c6ceb555ccce342c2cc34a6ad506ad723b31277
parent4001124d32bfba695e1154c4a3435f99d8c5c051
parent3a8bae3e057a775070b5da887ce506a5f9ec6139
Merge commit 'origin/master' into dev-mini2440-stable

Conflicts:
Makefile.target
hw/boards.h
hw/flash.h
target-arm/machine.c
Makefile.target
hw/boards.h
hw/flash.h
hw/nand.c
target-arm/machine.c