summaryrefslogtreecommitdiff
path: root/board/cpc45
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-08-09 14:41:17 -0500
committerJon Loeliger <jdl@freescale.com>2006-08-09 14:41:17 -0500
commit92c427b18982167064de454ae5248ec466998919 (patch)
treea60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01 /board/cpc45
parent281f69ede28cd3d8be5d62a96b5a0b73e6065858 (diff)
parent34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb (diff)
downloadu-boot-imx-92c427b18982167064de454ae5248ec466998919.zip
u-boot-imx-92c427b18982167064de454ae5248ec466998919.tar.gz
u-boot-imx-92c427b18982167064de454ae5248ec466998919.tar.bz2
Merge branch 'mpc85xx'
Conflicts: include/ft_build.h include/pci.h Resolved, though.
Diffstat (limited to 'board/cpc45')
0 files changed, 0 insertions, 0 deletions