---

yaml --- r: 302589 b: refs/heads/master c: c3bccbf h: refs/heads/master i: 302587: 20d7cfa v: v3
git-mirror · May 8, 2012 · e1f1602 · e1f1602
1 parent 3128c26
commit e1f1602
Show file tree

Hide file tree

Showing 2,543 changed files with 97,736 additions and 117,681 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da4f58ffa08a7b7012fab9c205fa0f6ba40fec42
+refs/heads/master: c3bccbfbb71f5e8a77129c7a069f5c5648cc9cf1
diff --git a/trunk/Documentation/ABI/removed/ip_queue b/trunk/Documentation/ABI/removed/ip_queue
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-net-mesh b/trunk/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -14,15 +14,6 @@ Description:
                 mesh will be sent using multiple interfaces at the
                 same time (if available).
 
-What:           /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance
-Date:           November 2011
-Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
-Description:
-                Indicates whether the bridge loop avoidance feature
-                is enabled. This feature detects and avoids loops
-                between the mesh and devices bridged with the soft
-                interface <mesh_iface>.
-
 What:           /sys/class/net/<mesh_iface>/mesh/fragmentation
 Date:           October 2010
 Contact:        Andreas Langer <an.langer@gmx.de>

diff --git a/trunk/Documentation/DocBook/80211.tmpl b/trunk/Documentation/DocBook/80211.tmpl
@@ -516,7 +516,7 @@
 !Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe
 !Finclude/net/mac80211.h ieee80211_stop_tx_ba_session
 !Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe
-!Finclude/net/mac80211.h ieee80211_rate_control_changed
+!Finclude/net/mac80211.h rate_control_changed
 !Finclude/net/mac80211.h ieee80211_tx_rate_control
 !Finclude/net/mac80211.h rate_control_send_low
       </chapter>

diff --git a/trunk/Documentation/devicetree/bindings/arm/arch_timer.txt b/trunk/Documentation/devicetree/bindings/arm/arch_timer.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/mdio-mux-gpio.txt b/trunk/Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/mdio-mux.txt b/trunk/Documentation/devicetree/bindings/net/mdio-mux.txt