summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-02-01 12:05:13 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 17:53:13 +0100
commit66188fae3bf7f8dd951e2291d2a81888ed1b65de (patch)
treee07737a7064e1d10e5d9a8f28c35de600f79440f
parent[PATCH] hrtimers: cleanups and simplifications (diff)
downloadlinux-66188fae3bf7f8dd951e2291d2a81888ed1b65de.tar.xz
linux-66188fae3bf7f8dd951e2291d2a81888ed1b65de.zip
[PATCH] hrtimers: add back lost credit lines
At some point we added credits to people who actively helped to bring k/hr-timers along. This was lost in the big code revamp. Add it back. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/ktime.h6
-rw-r--r--kernel/hrtimer.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 1bd6552cc341..6aca67a569a2 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -10,6 +10,12 @@
*
* Started by: Thomas Gleixner and Ingo Molnar
*
+ * Credits:
+ *
+ * Roman Zippel provided the ideas and primary code snippets of
+ * the ktime_t union and further simplifications of the original
+ * code.
+ *
* For licencing details see kernel-base/COPYING
*/
#ifndef _LINUX_KTIME_H
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index efff9496b2fa..2b6e1757aedd 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -21,6 +21,12 @@
* Credits:
* based on kernel/timer.c
*
+ * Help, testing, suggestions, bugfixes, improvements were
+ * provided by:
+ *
+ * George Anzinger, Andrew Morton, Steven Rostedt, Roman Zippel
+ * et. al.
+ *
* For licencing details see kernel-base/COPYING
*/