From b7f660df2ba552165527090705c6732e0a6af2a9 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 31 Mar 2012 12:45:43 +0200
Subject: [PATCH] --- yaml --- r: 299077 b: refs/heads/master c:
 3872c48b14259d8c0a00c9fff06a4a4123f7f4eb h: refs/heads/master i:   299075:
 c7b5c5a44e8850f646d34380e9081d2eb02ed5fd v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/time/Kconfig | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e94f37596369..03b210127b59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb85a6ed67e979c59a29b7b4e8217e755b951cf4
+refs/heads/master: 3872c48b14259d8c0a00c9fff06a4a4123f7f4eb
diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
index 2cf9cc7aa103..a20dc8a3c949 100644
--- a/trunk/kernel/time/Kconfig
+++ b/trunk/kernel/time/Kconfig
@@ -1,6 +1,10 @@
 #
 # Timer subsystem related configuration options
 #
+
+# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
+# only related to the tick functionality. Oneshot clockevent devices
+# are supported independ of this.
 config TICK_ONESHOT
 	bool