Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc drivers/misc/fsl_ifc.c
Simple merge

diff --cc drivers/mtd/nand/fsl_ifc_nand.c
Simple merge

diff --cc drivers/mtd/nand/fsl_ifc_spl.c
Simple merge

diff --cc include/configs/C29XPCIE.h
Simple merge

diff --cc include/configs/MPC8572DS.h
Simple merge

diff --cc include/fsl_ifc.h
Simple merge

diff --cc include/phy.h
Simple merge