Merge branch 'mpc85xx'

Conflicts:

	include/ft_build.h
	include/pci.h

Resolved, though.

diff --cc README
Simple merge

diff --cc common/cmd_bootm.c
index e5d70fa202ae35f7a311c8b0c6740bdc0ec03fa6,f1c0eb4d183959e32d2f21a3e6180b73fefb8a01..0225cb7f2734c5f03caebef3e8f6321c42cf58b6
--- 1/common/cmd_bootm.c
--- 2/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@@ -824,10 -836,10 +836,10 @@@ do_bootm_linux (cmd_tbl_t *cmdtp, int f
        (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
  
  #else
-       ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
+       ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
        /* ft_dump_blob(of_flat_tree); */
  
 -#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
 +#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500)||!defined(CONFIG_MPC86xx))
        unlock_ram_in_cache();
  #endif
        /*

diff --cc drivers/pci_auto.c
Simple merge