summaryrefslogtreecommitdiff
path: root/include/configs/CPU86.h
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2006-11-29 09:45:03 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2006-11-29 09:45:03 +0800
commit6bd87c0aeea441c49d59fd542b84a9be88d08b17 (patch)
treee450a5f1e69a78a203a1e15167d7fefa43c5ce7e /include/configs/CPU86.h
parent0a8eb59983047ae3bcc0babf3ee4d10d01abe7da (diff)
parentd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff)
downloadu-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.zip
u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.gz
u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.bz2
Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c
Diffstat (limited to 'include/configs/CPU86.h')
0 files changed, 0 insertions, 0 deletions