From: Paul Mackerras <paulus@samba.org>
Date: Mon, 9 Jun 2008 02:19:41 +0000 (+1000)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.27-rc1~1058^2~174
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a3e1c670e503ddd6f6c373b307f38b783ee3a50;p=linux-2.6

Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c
---

8a3e1c670e503ddd6f6c373b307f38b783ee3a50
diff --cc arch/powerpc/sysdev/fsl_soc.c
index 14616d5d12,019657c110..ca54563d5c
--- a/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,