diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:56:34 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:57:51 -0400 |
| commit | 72e20f5704987c27e549c85706b125fd4bac02c7 (patch) | |
| tree | c5a252708f5a4f6e04cd9390c5bd29b8bd48fda4 /include/configs/jupiter.h | |
| parent | 405bb978ee2321b6cf5381a012c812bdc7679e40 (diff) | |
| parent | 251484cfb845d5d54c652a1801270ede1521ca6d (diff) | |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
include/configs/at91sam9261ek.h
Diffstat (limited to 'include/configs/jupiter.h')
0 files changed, 0 insertions, 0 deletions