summaryrefslogtreecommitdiff
path: root/include/configs/mpc7448hpc2.h
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2007-02-28 16:46:48 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2007-02-28 16:46:48 +0800
commit00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch)
treedc49c4219bafd43c2ace6c5a3e6745d7b7264194 /include/configs/mpc7448hpc2.h
parent30bddf2c46ab2e824f217a38db033118ac4622af (diff)
parentccbc7036648e465697ca298ba51e0e76dda352a0 (diff)
Merge branch 'master' into hpc2
Conflicts: drivers/Makefile Fix the merge conflict in file drivers/Makefile Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'include/configs/mpc7448hpc2.h')
0 files changed, 0 insertions, 0 deletions