From a7393d78a4d79733bbc1508303d160cfd9d43251 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 9 Aug 2010 16:32:50 -0700
Subject: [PATCH] --- yaml --- r: 208360 b: refs/heads/master c:
 0caa621065b2cc05d4e53655a34fd989f500b040 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/timer.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7e87b0c2e86f..3b15a9f5deb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f7436a5b09d9c6d67ed272be9641af003b1b3b2
+refs/heads/master: 0caa621065b2cc05d4e53655a34fd989f500b040
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index f1b8afe1ad86..97bf05baade7 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -326,6 +326,7 @@ EXPORT_SYMBOL_GPL(round_jiffies_up_relative);
 
 /**
  * set_timer_slack - set the allowed slack for a timer
+ * @timer: the timer to be modified
  * @slack_hz: the amount of time (in jiffies) allowed for rounding
  *
  * Set the amount of time, in jiffies, that a certain timer has