diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 01:12:56 +0100 |
| commit | 81b38be8631a0b809c97ab3d929f491373d7314f (patch) | |
| tree | 0dd6444e2b602dcd06524f57c234b1f3b18ceb83 /cpu/mpc85xx | |
| parent | f77ac3d657e9b1d40012153e872a2118cca10a3d (diff) | |
| parent | 29592ecba3b932b9b152bcec6c0c0806412db4a3 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Conflicts:
MAINTAINERS
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/mpc85xx')
0 files changed, 0 insertions, 0 deletions