---

yaml --- r: 302736 b: refs/heads/master c: 2fdbb31 h: refs/heads/master v: v3
git-mirror · Apr 25, 2012 · e12c3db · e12c3db
1 parent c1fc25c
commit e12c3db
Show file tree

Hide file tree

Showing 3,039 changed files with 106,552 additions and 136,198 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ec29e3149d800e6db83c1b6ff441daf319cbbe2
+refs/heads/master: 2fdbb31b662787f78bb78b3e4e18f1a072058ffc
diff --git a/trunk/Documentation/ABI/removed/ip_queue b/trunk/Documentation/ABI/removed/ip_queue
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-hsi b/trunk/Documentation/ABI/testing/sysfs-bus-hsi
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/...devicetree/bindings/ata/ahci-platform.txt → .../devicetree/bindings/ata/calxeda-sata.txt b/...devicetree/bindings/ata/ahci-platform.txt → .../devicetree/bindings/ata/calxeda-sata.txt
@@ -1,10 +1,10 @@
-* AHCI SATA Controller
+* Calxeda SATA Controller
 
 SATA nodes are defined to describe on-chip Serial ATA controllers.
 Each SATA controller should have its own node.
 
 Required properties:
-- compatible        : compatible list, contains "calxeda,hb-ahci" or "snps,spear-ahci"
+- compatible        : compatible list, contains "calxeda,hb-ahci"
 - interrupts        : <interrupt mapping for SATA IRQ>
 - reg               : <registers mapping>
 
@@ -14,3 +14,4 @@ Example:
                 reg = <0xffe08000 0x1000>;
                 interrupts = <115>;
         };
+
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