diff --git a/[refs] b/[refs]
index a9450d533110..34e2451c1aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41eaa2dcb98977b3824b8a4c12b5030af7bb0b29
+refs/heads/master: 4a6b88ca3d9a301b496d6bfc18bc40c78fbb3669
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
index 40ac7759c3bb..c1067e48b529 100644
--- a/trunk/Documentation/00-INDEX
+++ b/trunk/Documentation/00-INDEX
@@ -132,12 +132,12 @@ dontdiff
 	- file containing a list of files that should never be diff'ed.
 driver-model/
 	- directory with info about Linux driver model.
-drivers/
-	- directory with driver documentation (currently only EDAC).
 dvb/
 	- info on Linux Digital Video Broadcast (DVB) subsystem.
 early-userspace/
 	- info about initramfs, klibc, and userspace early during boot.
+edac.txt
+	- information on EDAC - Error Detection And Correction
 eisa.txt
 	- info on EISA bus support.
 exception.txt
diff --git a/trunk/Documentation/drivers/edac/edac.txt b/trunk/Documentation/edac.txt
similarity index 100%
rename from trunk/Documentation/drivers/edac/edac.txt
rename to trunk/Documentation/edac.txt