- fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h.patch removed from -mm tree

- fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h.patch removed from -mm tree

[akpm]

The patch titled
     fix DocBook build
has been removed from the -mm tree.  Its filename was
     fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: fix DocBook build
From: Don Mullis <dwm@meer.net>

Fix DocBook build.  Regression was introduced by
gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h.patch

Tested by `make htmldocs`.

Signed-off-by: Don Mullis <dwm@meer.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/DocBook/gadget.tmpl |    4 ++--
 Documentation/DocBook/usb.tmpl    |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -puN Documentation/DocBook/gadget.tmpl~fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h Documentation/DocBook/gadget.tmpl
--- a/Documentation/DocBook/gadget.tmpl~fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h
+++ a/Documentation/DocBook/gadget.tmpl
@@ -482,13 +482,13 @@ slightly.
 <para>Gadget drivers
 rely on common USB structures and constants
 defined in the
-<filename>&lt;linux/usb_ch9.h&gt;</filename>
+<filename>&lt;linux/usb/ch9.h&gt;</filename>
 header file, which is standard in Linux 2.6 kernels.
 These are the same types and constants used by host
 side drivers (and usbcore).
 </para>
 
-!Iinclude/linux/usb_ch9.h
+!Iinclude/linux/usb/ch9.h
 </sect1>
 
 <sect1 id="core"><title>Core Objects and Methods</title>
diff -puN Documentation/DocBook/usb.tmpl~fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h Documentation/DocBook/usb.tmpl
--- a/Documentation/DocBook/usb.tmpl~fix-gregkh-usb-usb-linux-usb_ch9h-becomes-linux-usb-ch9h
+++ a/Documentation/DocBook/usb.tmpl
@@ -187,13 +187,13 @@
 
 <chapter><title>USB-Standard Types</title>
 
-    <para>In <filename>&lt;linux/usb_ch9.h&gt;</filename> you will find
+    <para>In <filename>&lt;linux/usb/ch9.h&gt;</filename> you will find
     the USB data types defined in chapter 9 of the USB specification.
     These data types are used throughout USB, and in APIs including
     this host side API, gadget APIs, and usbfs.
     </para>
 
-!Iinclude/linux/usb_ch9.h
+!Iinclude/linux/usb/ch9.h
 
     </chapter>
 
@@ -574,7 +574,7 @@ for (;;) {
 #include &lt;asm/byteorder.h&gt;</programlisting>
 	    The standard USB device model requests, from "Chapter 9" of
 	    the USB 2.0 specification, are automatically included from
-	    the <filename>&lt;linux/usb_ch9.h&gt;</filename> header.
+	    the <filename>&lt;linux/usb/ch9.h&gt;</filename> header.
 	    </para>
 
 	    <para>Unless noted otherwise, the ioctl requests
_

Patches currently in -mm which might be from dwm@meer.net are

origin.patch