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

Commit 56dbed12 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into idle-test

parents 2a2d31c8 f878133b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+0 −2
Original line number Diff line number Diff line
@@ -2365,8 +2365,6 @@ E: acme@redhat.com 
W: http://oops.ghostprotocols.net:81/blog/

P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01

D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

S: R. Brasílio Itiberê, 4270/1010 - Água Verde

S: 80240-060 - Curitiba - Paraná

S: Brazil



N: Karsten Merker

drivers/staging/batman-adv/sysfs-class-net-mesh→Documentation/ABI/testing/sysfs-class-net-mesh

+28 −0
Original line number Diff line number Diff line
@@ -22,6 +22,27 @@ Description: 
                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.



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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the bandwidth which is propagated by this

                node if gw_mode was set to 'server'.



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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the state of the gateway features. Can be

                either 'off', 'client' or 'server'.



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

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.



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

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>
@@ -29,6 +50,13 @@ Description: 
                Defines the interval in milliseconds in which batman

                sends its protocol messages.



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

Date:           Oct 2010

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

		Defines the penalty which will be applied to an

		originator message's tq-field on every hop.



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

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone

+8 −8
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/actual_dpi

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/actual_dpi

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	It is possible to switch the dpi setting of the mouse with the
@@ -17,13 +17,13 @@ Description: It is possible to switch the dpi setting of the mouse with the 


		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/actual_profile

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/actual_profile

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns the number of the actual profile.

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/firmware_version

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/firmware_version

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns the raw integer version number of the
@@ -33,7 +33,7 @@ Description: When read, this file returns the raw integer version number of the 
		left. E.g. a returned value of 138 means 1.38

		This file is readonly.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/profile[1-5]

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the
@@ -48,7 +48,7 @@ Description: The mouse can store 5 profiles which can be switched by the 
		stored in the profile doesn't need to fit the number of the

		store.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/settings

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/settings

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns the settings stored in the mouse.
@@ -58,7 +58,7 @@ Description: When read, this file returns the settings stored in the mouse. 
		The data has to be 36 bytes long. The mouse will reject invalid

		data.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/startup_profile

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/startup_profile

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 1 to 5.
@@ -67,7 +67,7 @@ Description: The integer value of this attribute ranges from 1 to 5. 
		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/tcu

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/tcu

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse has a "Tracking Control Unit" which lets the user
@@ -78,7 +78,7 @@ Description: The mouse has a "Tracking Control Unit" which lets the user 
		Writing 1 in this file will start the calibration which takes

		around 6 seconds to complete and activates the TCU.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/weight

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kone/roccatkone<minor>/weight

Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can be equipped with one of four supplied weights