[GIT pull] timers update for 4.13

[Thomas Gleixner]

Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

Add Frederic Weisbecker as NOHZ/dyntick maintainer.

Thanks,

	tglx

------------------>
Ingo Molnar (1):
      MAINTAINERS: Add Frederic Weisbecker as nohz/dyntics maintainer


 MAINTAINERS                | 14 ++++++++++++--
 include/linux/sched/nohz.h |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d357695ee4fe..a7be0d553dba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6034,7 +6034,7 @@ F:	drivers/hid/hid-sensor-*
 F:	drivers/iio/*/hid-*
 F:	include/linux/hid-sensor-*
 
-HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
+HIGH-RESOLUTION TIMERS, CLOCKEVENTS
 M:	Thomas Gleixner <tglx@xxxxxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@ -6042,7 +6042,6 @@ S:	Maintained
 F:	Documentation/timers/
 F:	kernel/time/hrtimer.c
 F:	kernel/time/clockevents.c
-F:	kernel/time/tick*.*
 F:	kernel/time/timer_*.c
 F:	include/linux/clockchips.h
 F:	include/linux/hrtimer.h
@@ -9090,6 +9089,17 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 S:	Maintained
 F:	arch/nios2/
 
+NOHZ, DYNTICKS SUPPORT
+M:	Frederic Weisbecker <fweisbec@xxxxxxxxx>
+M:	Thomas Gleixner <tglx@xxxxxxxxxxxxx>
+M:	Ingo Molnar <mingo@xxxxxxxxxx>
+L:	linux-kernel@xxxxxxxxxxxxxxx
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
+S:	Maintained
+F:	kernel/time/tick*.*
+F:	include/linux/tick.h
+F:	include/linux/sched/nohz.h
+
 NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
 M:	Pavel Machek <pavel@xxxxxx>
 M:	Sakari Ailus <sakari.ailus@xxxxxx>
diff --git a/include/linux/sched/nohz.h b/include/linux/sched/nohz.h
index 7d3f75db23e5..028d17b918a7 100644
--- a/include/linux/sched/nohz.h
+++ b/include/linux/sched/nohz.h
@@ -2,7 +2,7 @@
 #define _LINUX_SCHED_NOHZ_H
 
 /*
- * This is the interface between the scheduler and nohz/dyntics:
+ * This is the interface between the scheduler and nohz/dynticks:
  */
 
 #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)