diff --git a/[refs] b/[refs]
index a4474c2760e0..8899f9c7c977 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ec160dd48b666ddef39d639323d0da26d0b710d
+refs/heads/master: 48ccf3dac341118992b70ca89c47728e8b1d300b
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 26671f4db07f..2a00c22203f3 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
 	}
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
 	tvec_base_t *old_base;
 	tvec_base_t *new_base;