Merge branch 'master' into for-next

Conflicts: arch/arm/mach-omap1/board-nokia770.c
2010-08-10 13:22:08 +02:00
parent 426d31071a f6cec0ae58
commit fb8231a8b1
3773 changed files with 257205 additions and 224091 deletions
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1599,7 +1599,7 @@ EXPORT_SYMBOL_GPL(device_destroy);
 * on the same device to ensure that new_name is valid and
 * won't conflict with other devices.
 */
-int device_rename(struct device *dev, char *new_name)
+int device_rename(struct device *dev, const char *new_name)
 {
 	char *old_class_name = NULL;
 	char *new_class_name = NULL;