From 7ce1ce3dee18e9d440a457a77a729c7a9df3d063 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2011 13:24:40 -0800
Subject: [PATCH] --- yaml --- r: 277053 b: refs/heads/master c:
 3b87487ac5008072f138953b07505a7e3493327f h: refs/heads/master i:   277051:
 022e2c9c237710b99cce4483f28d2d60e325f400 v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/time/clockevents.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a45fb9afa59e..df32cc74eeb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995b4103a78b9bef0ff834f9ecac42b2b56e01a8
+refs/heads/master: 3b87487ac5008072f138953b07505a7e3493327f
diff --git a/trunk/kernel/time/clockevents.c b/trunk/kernel/time/clockevents.c
index c4eb71c8b2ea..1ecd6ba36d6c 100644
--- a/trunk/kernel/time/clockevents.c
+++ b/trunk/kernel/time/clockevents.c
@@ -387,7 +387,6 @@ void clockevents_exchange_device(struct clock_event_device *old,
 	 * released list and do a notify add later.
 	 */
 	if (old) {
-		old->event_handler = clockevents_handle_noop;
 		clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED);
 		list_del(&old->list);
 		list_add(&old->list, &clockevents_released);