Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9d59a2 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into for-next

parents a23ce6da 795abaf1

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Documentation/ABI/stable/thermal-notification

0 → 100644
+4 −0
Original line number Diff line number Diff line 
What:		A notification mechanism for thermal related events

Description:

	This interface enables notification for thermal related events.

	The notification is in the form of a netlink event.

Documentation/ABI/testing/sysfs-platform-at91

0 → 100644
+25 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/at91_can/net/<iface>/mb0_id

Date:		January 2011

KernelVersion:	2.6.38

Contact:	Marc Kleine-Budde <kernel@pengutronix.de>

Description:

		Value representing the can_id of mailbox 0.



		Default: 0x7ff (standard frame)



		Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in

		"AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the

		contents of mailbox 0 may be send under certain

		conditions (even if disabled or in rx mode).



		The workaround in the errata suggests not to use the

		mailbox and load it with an unused identifier.



		In order to use an extended can_id add the

		CAN_EFF_FLAG (0x80000000U) to the can_id. Example:



		- standard id 0x7ff:

		echo 0x7ff      > /sys/class/net/can0/mb0_id



		- extended id 0x1fffffff:

		echo 0x9fffffff > /sys/class/net/can0/mb0_id

Documentation/DocBook/80211.tmpl

+17 −4
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ 
!Finclude/net/mac80211.h ieee80211_ops

!Finclude/net/mac80211.h ieee80211_alloc_hw

!Finclude/net/mac80211.h ieee80211_register_hw

!Finclude/net/mac80211.h ieee80211_get_tx_led_name

!Finclude/net/mac80211.h ieee80211_get_rx_led_name

!Finclude/net/mac80211.h ieee80211_get_assoc_led_name

!Finclude/net/mac80211.h ieee80211_get_radio_led_name

!Finclude/net/mac80211.h ieee80211_unregister_hw

!Finclude/net/mac80211.h ieee80211_free_hw

      </chapter>
@@ -382,6 +378,23 @@ 
        </para>

      </partintro>



      <chapter id="led-support">

        <title>LED support</title>

        <para>

         Mac80211 supports various ways of blinking LEDs. Wherever possible,

         device LEDs should be exposed as LED class devices and hooked up to

         the appropriate trigger, which will then be triggered appropriately

         by mac80211.

        </para>

!Finclude/net/mac80211.h ieee80211_get_tx_led_name

!Finclude/net/mac80211.h ieee80211_get_rx_led_name

!Finclude/net/mac80211.h ieee80211_get_assoc_led_name

!Finclude/net/mac80211.h ieee80211_get_radio_led_name

!Finclude/net/mac80211.h ieee80211_tpt_blink

!Finclude/net/mac80211.h ieee80211_tpt_led_trigger_flags

!Finclude/net/mac80211.h ieee80211_create_tpt_led_trigger

      </chapter>



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

        <title>Hardware crypto acceleration</title>

!Pinclude/net/mac80211.h Hardware crypto acceleration

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>



  <chapter id="fbdev">