Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 4ba384f1ab54..2df9414a72f7 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -448,8 +448,6 @@ static int intel_idle_probe(void)
         else
                 on_each_cpu(__setup_broadcast_timer, (void *)true, 1);
 
-        register_cpu_notifier(&cpu_hotplug_notifier);
-
         pr_debug(PREFIX "v" INTEL_IDLE_VERSION
                 " model 0x%X\n", boot_cpu_data.x86_model);
 
@@ -612,6 +610,7 @@ static int __init intel_idle_init(void)
                         return retval;
                 }
         }
+        register_cpu_notifier(&cpu_hotplug_notifier);
 
         return 0;
 }