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

Commit 8cef081c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes 



The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3d55c29f 9161c3b7

Documentation/ABI/testing/sysfs-devices-system-xen_cpu

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
What:		/sys/devices/system/xen_cpu/

Date:		May 2012

Contact:	Liu, Jinsong <jinsong.liu@intel.com>

Description:

		A collection of global/individual Xen physical cpu attributes



		Individual physical cpu attributes are contained in

		subdirectories named by the Xen's logical cpu number, e.g.:

		/sys/devices/system/xen_cpu/xen_cpu#/





What:		/sys/devices/system/xen_cpu/xen_cpu#/online

Date:		May 2012

Contact:	Liu, Jinsong <jinsong.liu@intel.com>

Description:

		Interface to online/offline Xen physical cpus



		When running under Xen platform, it provide user interface

		to online/offline physical cpus, except cpu0 due to several

		logic restrictions and assumptions.

Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_to_select

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This controls if mouse clicks should be generated if the trackpoint is quickly pressed. How fast this press has to be

		is being controlled by press_speed.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	If this setting is enabled, it is possible to do dragging by pressing the trackpoint. This requires press_to_select to be enabled.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	For details regarding this setting please refer to http://www.pc.ibm.com/ww/healthycomputing/trkpntb.html

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This setting controls if the mouse click events generated by pressing the trackpoint (if press_to_select is enabled) generate

		a left or right mouse button click.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This file contains the trackpoint sensitivity.

		Values are decimal integers from 1 (lowest sensitivity) to 255 (highest sensitivity).



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This setting controls how fast the trackpoint needs to be pressed to generate a mouse click if press_to_select is enabled.

		Values are decimal integers from 1 (slowest) to 255 (fastest).

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

0 → 100644
+77 −0
Original line number Original line Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/buttons

Date:		Mai 2012

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		button settings. buttons holds informations about button layout.

		When written, this file lets one write the respective profile

		buttons to the mouse. The data has to be 47 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/control

Date:		Mai 2012

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

Description:	When written, this file lets one select which data from which

		profile will be	read next. The data has to be 3 bytes long.

		This file is writeonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/general

Date:		Mai 2012

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		button settings. profile holds informations like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 43 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		This file is writeonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/info

Date:		Mai 2012

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

Description:	When read, this file returns general data like firmware version.

		The data is 8 bytes long.

		This file is readonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/macro

Date:		Mai 2012

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

Description:	When written, this file lets one store macros with max 500

		keystrokes for a specific button for a specific profile.

		Button and profile numbers are included in written data.

		The data has to be 2083 bytes long.

		Before reading this file, control has to be written to select

		which profile and key to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/profile

Date:		Mai 2012

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. profile holds number of actual profile.

		This value is persistent, so its value determines the profile

		that's active when the mouse is powered on next time.

		When written, the mouse activates the set profile immediately.

		The data has to be 3 bytes long.

		The mouse will reject invalid data.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/sensor

Date:		July 2012

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

Description:	The mouse has a Avago ADNS-3090 sensor.

		This file allows reading and writing of the mouse sensors registers.

		The data has to be 4 bytes long.

Users:		http://roccat.sourceforge.net

Documentation/ABI/testing/sysfs-kernel-iommu_groups

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
What:		/sys/kernel/iommu_groups/

Date:		May 2012

KernelVersion:	v3.5

Contact:	Alex Williamson <alex.williamson@redhat.com>

Description:	/sys/kernel/iommu_groups/ contains a number of sub-

		directories, each representing an IOMMU group.  The

		name of the sub-directory matches the iommu_group_id()

		for the group, which is an integer value.  Within each

		subdirectory is another directory named "devices" with

		links to the sysfs devices contained in this group.

		The group directory also optionally contains a "name"

		file if the IOMMU driver has chosen to register a more

		common name for the group.

Users:

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Original line Diff line number Diff line
@@ -404,7 +404,6 @@ 
!Finclude/net/mac80211.h ieee80211_get_tkip_p1k

!Finclude/net/mac80211.h ieee80211_get_tkip_p1k

!Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv

!Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv

!Finclude/net/mac80211.h ieee80211_get_tkip_p2k

!Finclude/net/mac80211.h ieee80211_get_tkip_p2k

!Finclude/net/mac80211.h ieee80211_key_removed

      </chapter>

      </chapter>





      <chapter id="powersave">

      <chapter id="powersave">