Merge branch 'jx/branch-vv-always-compare-with-upstream'

diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index f716d6d97f1cbb66b36a1e06ec2c268abf0a5ed1..242a044db978b8bd7cf9dabcbc31a2eb51056da6 100644 (file)
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt
@@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
 on-disk timestamps, resulting in meaningless changes when an
 inode is evicted from the inode cache.  See commit 8ce13b0
 of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
-([PATCH] Sync in core time granuality with filesystems,
+([PATCH] Sync in core time granularity with filesystems,
 2005-01-04).
 
 Racy Git