Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c

arch/powerpc/sysdev/fsl_soc.c

@@ -432,7 +432,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = {
 	{"dallas,ds1339",  "ds1339"},
 	{"dallas,ds1340",  "ds1340"},
 	{"stm,m41t00",     "m41t00"},
-	{"dallas,ds1374",  "rtc-ds1374"},
+	{"dallas,ds1374",  "ds1374"},
 	{"cirrus,cs4270",  "cs4270"},
 };