---

yaml
---
r: 135555
b: refs/heads/master
c: e072b63
h: refs/heads/master
i:
  135553: 09e6839
  135551: 7784023
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3daa4a5960cd9d39bad88679fcf587b456c05d
+refs/heads/master: e072b639dc13b06b65be487633dad9bb3d2067d5

trunk/Documentation/DocBook/mac80211.tmpl

@@ -17,7 +17,8 @@
     </authorgroup>
 
     <copyright>
-      <year>2007-2009</year>
+      <year>2007</year>
+      <year>2008</year>
       <holder>Johannes Berg</holder>
     </copyright>
 
@@ -164,8 +165,8 @@ usage should require reading the full document.
 !Pinclude/net/mac80211.h Frame format
       </sect1>
       <sect1>
-        <title>Packet alignment</title>
-!Pnet/mac80211/rx.c Packet alignment
+        <title>Alignment issues</title>
+        <para>TBD</para>
       </sect1>
       <sect1>
         <title>Calling into mac80211 from interrupts</title>
@@ -222,11 +223,6 @@ usage should require reading the full document.
 !Finclude/net/mac80211.h ieee80211_key_flags
     </chapter>
 
-    <chapter id="powersave">
-      <title>Powersave support</title>
-!Pinclude/net/mac80211.h Powersave support
-    </chapter>
-
     <chapter id="qos">
       <title>Multiple queues and QoS support</title>
       <para>TBD</para>

trunk/Documentation/feature-removal-schedule.txt

@@ -229,9 +229,7 @@ Who:	Jan Engelhardt <jengelh@computergmbh.de>
 ---------------------------
 
 What:	b43 support for firmware revision < 410
-When:	The schedule was July 2008, but it was decided that we are going to keep the
-        code as long as there are no major maintanance headaches.
-	So it _could_ be removed _any_ time now, if it conflicts with something new.
+When:	July 2008
 Why:	The support code for the old firmware hurts code readability/maintainability
 	and slightly hurts runtime performance. Bugfixes for the old firmware
 	are not provided by Broadcom anymore.

trunk/Documentation/networking/dccp.txt

@@ -141,8 +141,7 @@ rx_ccid = 2
 	Default CCID for the receiver-sender half-connection; see tx_ccid.
 
 seq_window = 100
-	The initial sequence window (sec. 7.5.2) of the sender. This influences
-	the local ackno validity and the remote seqno validity windows (7.5.1).
+	The initial sequence window (sec. 7.5.2).
 
 tx_qlen = 5
 	The size of the transmit buffer in packets. A value of 0 corresponds