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, 5 deletions

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index df7dd08d4391..de20ec480fa0 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -195,11 +195,7 @@ void proc_device_tree_add_node(struct device_node *np,
         set_node_proc_entry(np, de);
         for (child = NULL; (child = of_get_next_child(np, child));) {
                 /* Use everything after the last slash, or the full name */
-                p = strrchr(child->full_name, '/');
-                if (!p)
-                        p = child->full_name;
-                else
-                        ++p;
+                p = kbasename(child->full_name);
 
                 if (duplicate_name(de, p))
                         p = fixup_name(np, de, p);