Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.

What:		/sys/class/net/<mesh_iface>/mesh/ap_isolation

Date:		May 2011

Contact:	Antonio Quartulli <ordex@autistici.org>

Description:

		Indicates whether the data traffic going from a

		wireless client to another wireless client will be

		silently dropped.

What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

          Insert notes about VLAN interfaces with hw crypto here or

          in the hw crypto chapter.

        </para>

      <section id="ps-client">

        <title>support for powersaving clients</title>

!Pinclude/net/mac80211.h AP support for powersaving clients

      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!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

!Finclude/net/mac80211.h ieee80211_sta_set_buffered

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </chapter>

      <chapter id="multi-iface">

!Finclude/net/mac80211.h sta_notify_cmd

!Finclude/net/mac80211.h ieee80211_find_sta

!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </chapter>

      <chapter id="hardware-scan-offload">

CAN Device Tree Bindings

------------------------

2011 Freescale Semiconductor, Inc.

Flexcan CAN contoller on Freescale's ARM and PowerPC system-on-a-chip (SOC).

fsl,flexcan-v1.0 nodes

-----------------------

In addition to the required compatible-, reg- and interrupt-properties, you can

also specify which clock source shall be used for the controller.

Required properties:

CPI Clock- Can Protocol Interface Clock

	This CLK_SRC bit of CTRL(control register) selects the clock source to

	the CAN Protocol Interface(CPI) to be either the peripheral clock

	(driven by the PLL) or the crystal oscillator clock. The selected clock

	is the one fed to the prescaler to generate the Serial Clock (Sclock).

	The PRESDIV field of CTRL(control register) controls a prescaler that

	generates the Serial Clock (Sclock), whose period defines the

	time quantum used to compose the CAN waveform.

- compatible : Should be "fsl,<processor>-flexcan"

Can Engine Clock Source

	There are two sources for CAN clock

	- Platform Clock  It represents the bus clock

	- Oscillator Clock

  An implementation should also claim any of the following compatibles

  that it is fully backwards compatible with:

	Peripheral Clock (PLL)

	--------------

		     |

		    ---------		      -------------

		    |       |CPI Clock	      | Prescaler |       Sclock

		    |       |---------------->| (1.. 256) |------------>

		    ---------		      -------------

                     |  |

	--------------  ---------------------CLK_SRC

	Oscillator Clock

  - fsl,p1010-flexcan

- fsl,flexcan-clock-source : CAN Engine Clock Source.This property selects

			     the peripheral clock. PLL clock is fed to the

			     prescaler to generate the Serial Clock (Sclock).

			     Valid values are "oscillator" and "platform"

			     "oscillator": CAN engine clock source is oscillator clock.

			     "platform" The CAN engine clock source is the bus clock

		             (platform clock).

- reg : Offset and length of the register set for this device

- interrupts : Interrupt tuple for this device

- clock-frequency : The oscillator frequency driving the flexcan device

- fsl,flexcan-clock-divider : for the reference and system clock, an additional

			      clock divider can be specified.

- clock-frequency: frequency required to calculate the bitrate for FlexCAN.

Example:

Note:

	- v1.0 of flexcan-v1.0 represent the IP block version for P1010 SOC.

	- P1010 does not have oscillator as the Clock Source.So the default

	  Clock Source is platform clock.

Examples:

	can0@1c000 {

		compatible = "fsl,flexcan-v1.0";

	can@1c000 {

		compatible = "fsl,p1010-flexcan";

		reg = <0x1c000 0x1000>;

		interrupts = <48 0x2>;

		interrupt-parent = <&mpic>;

		fsl,flexcan-clock-source = "platform";

		fsl,flexcan-clock-divider = <2>;

		clock-frequency = <fixed by u-boot>;

		clock-frequency = <200000000>; // filled in by bootloader

	};

* Smart Mixed-Signal Connectivity (SMSC) LAN911x/912x Controller

Required properties:

- compatible : Should be "smsc,lan<model>", "smsc,lan9115"

- reg : Address and length of the io space for SMSC LAN

- interrupts : Should contain SMSC LAN interrupt line

- interrupt-parent : Should be the phandle for the interrupt controller

  that services interrupts for this device

- phy-mode : String, operation mode of the PHY interface.

  Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",

  "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".

Optional properties:

- reg-shift : Specify the quantity to shift the register offsets by

- reg-io-width : Specify the size (in bytes) of the IO accesses that

  should be performed on the device.  Valid value for SMSC LAN is

  2 or 4.  If it's omitted or invalid, the size would be 2.

- smsc,irq-active-high : Indicates the IRQ polarity is active-high

- smsc,irq-push-pull : Indicates the IRQ type is push-pull

- smsc,force-internal-phy : Forces SMSC LAN controller to use

  internal PHY

- smsc,force-external-phy : Forces SMSC LAN controller to use

  external PHY

- smsc,save-mac-address : Indicates that mac address needs to be saved

  before resetting the controller

- local-mac-address : 6 bytes, mac address

Examples:

lan9220@f4000000 {

	compatible = "smsc,lan9220", "smsc,lan9115";

	reg = <0xf4000000 0x2000000>;

	phy-mode = "mii";

	interrupt-parent = <&gpio1>;

	interrupts = <31>;

	reg-io-width = <4>;

	smsc,irq-push-pull;

};

Who:    Lee, Chun-Yi <jlee@novell.com>

----------------------------

What:	The XFS nodelaylog mount option

When:	3.3

Why:	The delaylog mode that has been the default since 2.6.39 has proven

	stable, and the old code is in the way of additional improvements in

	the log code.

Who:	Christoph Hellwig <hch@lst.de>

----------------------------

What:	iwlagn alias support

When:	3.5

Why:	The iwlagn module has been renamed iwlwifi.  The alias will be around

	for backward compatibility for several cycles and then dropped.

Who:	Don Fry <donald.h.fry@intel.com>