---

yaml --- r: 369255 b: refs/heads/master c: dded45f h: refs/heads/master i: 369253: 8c46f94 369251: 9389a2d 369247: 414a2b2 v: v3
git-mirror · Mar 30, 2013 · 2f86e1c · 2f86e1c
1 parent e535640
commit 2f86e1c
Show file tree

Hide file tree

Showing 864 changed files with 10,443 additions and 34,393 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d2f0e68c4de36c56fbe3baeae30c001f012243
+refs/heads/master: dded45fc179a07f4463ce37fc376977568655836
diff --git a/trunk/Documentation/DocBook/80211.tmpl b/trunk/Documentation/DocBook/80211.tmpl
@@ -437,7 +437,7 @@
       </section>
 !Finclude/net/mac80211.h ieee80211_get_buffered_bc
 !Finclude/net/mac80211.h ieee80211_beacon_get
-!Finclude/net/mac80211.h ieee80211_sta_eosp
+!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe
 !Finclude/net/mac80211.h ieee80211_frame_release_type
 !Finclude/net/mac80211.h ieee80211_sta_ps_transition
 !Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

diff --git a/trunk/Documentation/cgroups/00-INDEX b/trunk/Documentation/cgroups/00-INDEX
@@ -18,8 +18,6 @@ memcg_test.txt
 	- Memory Resource Controller; implementation details.
 memory.txt
 	- Memory Resource Controller; design, accounting, interface, testing.
-net_cls.txt
-	- Network classifier cgroups details and usages.
 net_prio.txt
 	- Network priority cgroups details and usages.
 resource_counter.txt

diff --git a/trunk/Documentation/cgroups/net_cls.txt b/trunk/Documentation/cgroups/net_cls.txt
diff --git a/trunk/Documentation/devicetree/bindings/marvell.txt b/trunk/Documentation/devicetree/bindings/marvell.txt
@@ -115,9 +115,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
      - compatible : "marvell,mv64360-eth-block"
      - reg : Offset and length of the register set for this block
 
-   Optional properties:
-     - clocks : Phandle to the clock control device and gate bit
-
    Example Discovery Ethernet block node:
      ethernet-block@2000 {
 	     #address-cells = <1>;

diff --git a/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt b/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
@@ -11,7 +11,6 @@ Required properties:
 
 Optional properties:
 - interrupts: interrupt line number for the SMI error/done interrupt
-- clocks: Phandle to the clock control device and gate bit
 
 The child nodes of the MDIO driver are the individual PHY devices
 connected to this MDIO bus. They must have a "reg" property given the

diff --git a/trunk/Documentation/networking/ieee802154.txt b/trunk/Documentation/networking/ieee802154.txt
@@ -71,9 +71,8 @@ submits skb to qdisc), so if you need something from that cb later, you should
 store info in the skb->data on your own.
 
 To hook the MLME interface you have to populate the ml_priv field of your
-net_device with a pointer to struct ieee802154_mlme_ops instance. The fields
-assoc_req, assoc_resp, disassoc_req, start_req, and scan_req are optional.
-All other fields are required.
+net_device with a pointer to struct ieee802154_mlme_ops instance. All fields are
+required.
 
 We provide an example of simple HardMAC driver at drivers/ieee802154/fakehard.c