Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/powerpc/boot/dts/mpc8610_hpcd.dts
Simple merge

diff --cc arch/powerpc/sysdev/fsl_soc.c
index 14616d5d12d5f4c9e52b27206b0164eb2a627373,019657c110b6feb2745750827904189181ee6f46..ca54563d5c7ecc2bd769c8f30aab4760f5e273f5
--- 1/arch/powerpc/sysdev/fsl_soc.c
--- 2/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@@ -432,8 -432,7 +432,8 @@@ static struct i2c_driver_device i2c_dev
        {"dallas,ds1339",  "ds1339"},
        {"dallas,ds1340",  "ds1340"},
        {"stm,m41t00",     "m41t00"},
-       {"dallas,ds1374",  "rtc-ds1374"},
+       {"dallas,ds1374",  "ds1374"},
 +      {"cirrus,cs4270",  "cs4270"},
  };
  
  static int __init of_find_i2c_driver(struct device_node *node,

diff --cc drivers/net/Kconfig
Simple merge