diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-14 15:12:01 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-14 15:12:01 +0200 |
| commit | 4ce846ec59f36b85d6644a769690ad3feb667575 (patch) | |
| tree | 6dfedf3eeebbab0eefde4d5d17e5fffec10c9536 /include/configs/integratorap.h | |
| parent | 429d9571f60631ae8a2fe12b11be4c75b0c2b37c (diff) | |
POST: Fix merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/integratorap.h')
0 files changed, 0 insertions, 0 deletions