Linux 3.1.7

Linux 3.1.7

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

I'm announcing the release of the 3.1.7 kernel.

It contains a single bugfix for resume issues that were reported by a
lot of people.  If you didn't have this problem, no need to upgrade.

The updated 3.1.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.1.y
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                  |    2 +-
 kernel/time/clockevents.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Greg Kroah-Hartman (1):
      Linux 3.1.7

Linus Torvalds (1):
      Revert "clockevents: Set noop handler in clockevents_exchange_device()"


[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: Linux 3.1.7

[Greg KH]

diff --git a/Makefile b/Makefile
index 2d6e0a8..96c48df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 1
-SUBLEVEL = 6
+SUBLEVEL = 7
 EXTRAVERSION =
 NAME = "Divemaster Edition"
 
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 13dfaab..e4c699d 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -286,7 +286,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);