Merge branch 'mpc85xx'
authorJon Loeliger <jdl@freescale.com>
Wed, 9 Aug 2006 19:41:17 +0000 (14:41 -0500)
committerJon Loeliger <jdl@freescale.com>
Wed, 9 Aug 2006 19:41:17 +0000 (14:41 -0500)
commit92c427b18982167064de454ae5248ec466998919
treea60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01
parent281f69ede28cd3d8be5d62a96b5a0b73e6065858
parent34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb
Merge branch 'mpc85xx'

Conflicts:

include/ft_build.h
include/pci.h

Resolved, though.
README
common/cmd_bootm.c
drivers/pci_auto.c