diff --git a/[refs] b/[refs]
index a63030b8914f..3cdfc2ac8c48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb44820c28bc9a042e1157b41c677018a8fdfc74
+refs/heads/master: 74286a3c276bca449f934b2cd921f9bced996e04
diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile
index c6c5e59daaca..6a0ad4715e9f 100644
--- a/trunk/Documentation/DocBook/Makefile
+++ b/trunk/Documentation/DocBook/Makefile
@@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    genericirq.xml s390-drivers.xml uio-howto.xml scsi_midlayer.xml
+	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml
 
 ###
 # The build process is as follows (targets):
diff --git a/trunk/Documentation/DocBook/scsi_midlayer.tmpl b/trunk/Documentation/DocBook/scsi.tmpl
similarity index 100%
rename from trunk/Documentation/DocBook/scsi_midlayer.tmpl
rename to trunk/Documentation/DocBook/scsi.tmpl