merge by hand - fix up rejections in Documentation/DocBook/Makefile

2 files changed, 5 insertions, 4 deletions

diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
index 083d24752b83..55d24433d151 100644
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
@@ -178,10 +178,9 @@ Released 1994-06-13
         7. ACKNOWLEDGMENTS.
 
         These drivers wouldn't have been done without the base
-        (and support) from Ross Biro <bir7@leland.stanford.edu>,
-        and D-Link Systems Inc.  The driver relies upon GPL-ed
-        source from D-Link Systems Inc. and from Russel Nelson at
-        Crynwr Software <nelson@crynwr.com>.
+        (and support) from Ross Biro, and D-Link Systems Inc.
+        The driver relies upon GPL-ed source from D-Link Systems Inc.
+        and from Russel Nelson at Crynwr Software <nelson@crynwr.com>.
 
         Additional input also from:
         Donald Becker <becker@super.org>, Alan Cox <A.Cox@swansea.ac.uk>
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index 1509f3aff968..3c0a5ba614d7 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -51,6 +51,8 @@ dev->hard_start_xmit:
         set_multicast_list
         Context: BHs disabled
         Notes: netif_queue_stopped() is guaranteed false
+               Interrupts must be enabled when calling hard_start_xmit.
+                (Interrupts must also be enabled when enabling the BH handler.)
         Return codes: 
         o NETDEV_TX_OK everything ok. 
         o NETDEV_TX_BUSY Cannot transmit packet, try later