summaryrefslogtreecommitdiff
path: root/include/arm946es.h
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2007-01-22 13:15:35 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2007-01-22 13:15:35 +0800
commitee460917afb74767aedc3da095d4fec4a50ba6f8 (patch)
treefdead38c4681fc9adbedd6836792660f933614d3 /include/arm946es.h
parenta41969e09b9d886091a804c2ba5f1ab84b084dd3 (diff)
parenta4012396645533aef218354eeba754dff0deace8 (diff)
downloadu-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.zip
u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.gz
u-boot-imx-ee460917afb74767aedc3da095d4fec4a50ba6f8.tar.bz2
Merge branch 'master' into hpc2
Conflicts: drivers/cfi_flash.c The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007 fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support mpc7448hpc2 board.
Diffstat (limited to 'include/arm946es.h')
0 files changed, 0 insertions, 0 deletions