Merge branch 'linus' into x86/urgent

Merge reason: Bring in changes that the next patch will depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index e8c327a45a55..bf880e966d3b 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -488,7 +488,7 @@ static int __init clk_debugfs_init(void)
         }
         return 0;
 err_out:
-        debugfs_remove(clk_debugfs_root); /* REVISIT: Cleanup correctly */
+        debugfs_remove_recursive(clk_debugfs_root);
         return err;
 }
 late_initcall(clk_debugfs_init);