Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c
index 702256a1ca11..9193e12df695 100644
--- a/arch/powerpc/sysdev/scom.c
+++ b/arch/powerpc/sysdev/scom.c
@@ -157,7 +157,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
         ent->map = SCOM_MAP_INVALID;
         spin_lock_init(&ent->lock);
         snprintf(ent->name, 8, "scom%d", i);
-        ent->blob.data = dn->full_name;
+        ent->blob.data = (void*) dn->full_name;
         ent->blob.size = strlen(dn->full_name);
 
         dir = debugfs_create_dir(ent->name, root);