From 0881a029feddbae277b469087a3c892e76b47d74 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 21 Oct 2012 12:05:51 +0200
Subject: [PATCH] --- yaml --- r: 334746 b: refs/heads/master c:
 fd0587339d80dd2fea5ead7f734676c9c618eace h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/Documentation/00-INDEX | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ee1d6751d18c..ace43f54d46f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7386cdbf2f57ea8cff3c9fde93f206e58b9fe13f
+refs/heads/master: fd0587339d80dd2fea5ead7f734676c9c618eace
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
index 49c051380daf..fec55dc5ed2f 100644
--- a/trunk/Documentation/00-INDEX
+++ b/trunk/Documentation/00-INDEX
@@ -210,6 +210,8 @@ local_ops.txt
 	- semantics and behavior of local atomic operations.
 lockdep-design.txt
 	- documentation on the runtime locking correctness validator.
+lockup-watchdogs.txt
+	- info on soft and hard lockup detectors (aka nmi_watchdog).
 logo.gif
 	- full colour GIF image of Linux logo (penguin - Tux).
 logo.txt
@@ -240,8 +242,6 @@ netlabel/
 	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
-nmi_watchdog.txt
-	- info on NMI watchdog for SMP systems.
 nommu-mmap.txt
 	- documentation about no-mmu memory mapping support.
 numastat.txt