From 91c5e03ec10711da37a69a686cd942f2cff0e0d7 Mon Sep 17 00:00:00 2001
From: Kalin KOZHUHAROV <kalin@thinrope.net>
Date: Sat, 1 Apr 2006 01:41:22 +0200
Subject: [PATCH] --- yaml --- r: 25205 b: refs/heads/master c:
 8ba8e95ed14a2771bbcb43300feda094f298853e h: refs/heads/master i:   25203:
 1009f6389de6565a4d116babc9d195c7fc9ac4ec v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/fs.h | 2 +-
 trunk/kernel/time.c      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0ab1480994b5..ff4e54e058f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36a891b67f95fd5e1442fc0f7f953809b94b3fbc
+refs/heads/master: 8ba8e95ed14a2771bbcb43300feda094f298853e
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 4ed7e602d703..1e9ebaba07b7 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -864,7 +864,7 @@ struct super_block {
 	 */
 	struct mutex s_vfs_rename_mutex;	/* Kludge */
 
-	/* Granuality of c/m/atime in ns.
+	/* Granularity of c/m/atime in ns.
 	   Cannot be worse than a second */
 	u32		   s_time_gran;
 };
diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c
index ff8e7019c4c4..b00ddc71cedb 100644
--- a/trunk/kernel/time.c
+++ b/trunk/kernel/time.c
@@ -410,7 +410,7 @@ EXPORT_SYMBOL(current_kernel_time);
  * current_fs_time - Return FS time
  * @sb: Superblock.
  *
- * Return the current time truncated to the time granuality supported by
+ * Return the current time truncated to the time granularity supported by
  * the fs.
  */
 struct timespec current_fs_time(struct super_block *sb)
@@ -421,11 +421,11 @@ struct timespec current_fs_time(struct super_block *sb)
 EXPORT_SYMBOL(current_fs_time);
 
 /**
- * timespec_trunc - Truncate timespec to a granuality
+ * timespec_trunc - Truncate timespec to a granularity
  * @t: Timespec
- * @gran: Granuality in ns.
+ * @gran: Granularity in ns.
  *
- * Truncate a timespec to a granuality. gran must be smaller than a second.
+ * Truncate a timespec to a granularity. gran must be smaller than a second.
  * Always rounds down.
  *
  * This function should be only used for timestamps returned by