Commit d4730ace authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' of... 

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

Sync with Linus' tree. This is necessary to have a base for
patch that fixes commit 35b4c01e ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.
parents c1c454b8 23783f81

CREDITS

+5 −0
Original line number Original line Diff line number Diff line
@@ -514,6 +514,11 @@ S: Bessemerstraat 21 
S: Amsterdam

S: Amsterdam

S: The Netherlands

S: The Netherlands





N: NeilBrown

E: neil@brown.name

P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9

D: NFSD Maintainer 2000-2007



N: Zach Brown

N: Zach Brown

E: zab@zabbo.net

E: zab@zabbo.net

D: maestro pci sound

D: maestro pci sound

Documentation/ABI/testing/sysfs-bus-pci

+18 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,24 @@ Description: 
		re-discover previously removed devices.

		re-discover previously removed devices.

		Depends on CONFIG_HOTPLUG.

		Depends on CONFIG_HOTPLUG.





What:		/sys/bus/pci/devices/.../msi_irqs/

Date:		September, 2011

Contact:	Neil Horman <nhorman@tuxdriver.com>

Description:

		The /sys/devices/.../msi_irqs directory contains a variable set

		of sub-directories, with each sub-directory being named after a

		corresponding msi irq vector allocated to that device.  Each

		numbered sub-directory N contains attributes of that irq.

		Note that this directory is not created for device drivers which

		do not support msi irqs



What:		/sys/bus/pci/devices/.../msi_irqs/<N>/mode

Date:		September 2011

Contact:	Neil Horman <nhorman@tuxdriver.com>

Description:

		This attribute indicates the mode that the irq vector named by

		the parent directory is in (msi vs. msix)



What:		/sys/bus/pci/devices/.../remove

What:		/sys/bus/pci/devices/.../remove

Date:		January 2009

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock

Date:           Oct 2011

KernelVersion:  3.0

Contact:        Mark Godfrey <mark.godfrey@stericsson.com>

Description:    The rtc_calibration attribute allows the userspace to

                calibrate the AB8500.s 32KHz Real Time Clock.

                Every 60 seconds the AB8500 will correct the RTC's value

                by adding to it the value of this attribute.

                The range of the attribute is -127 to +127 in units of

                30.5 micro-seconds (half-parts-per-million of the 32KHz clock)

Users:          The /vendor/st-ericsson/base_utilities/core/rtc_calibration

                daemon uses this interface.

Documentation/ABI/testing/sysfs-devices-platform-docg3

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
What:		/sys/devices/platform/docg3/f[0-3]_dps[01]_is_keylocked

Date:		November 2011

KernelVersion:	3.3

Contact:	Robert Jarzmik <robert.jarzmik@free.fr>

Description:

		Show whether the floor (0 to 4), protection area (0 or 1) is

		keylocked. Each docg3 chip (or floor) has 2 protection areas,

		which can cover any part of it, block aligned, called DPS.

		The protection has information embedded whether it blocks reads,

		writes or both.

		The result is:

		0 -> the DPS is not keylocked

		1 -> the DPS is keylocked

Users:		None identified so far.



What:		/sys/devices/platform/docg3/f[0-3]_dps[01]_protection_key

Date:		November 2011

KernelVersion:	3.3

Contact:	Robert Jarzmik <robert.jarzmik@free.fr>

Description:

		Enter the protection key for the floor (0 to 4), protection area

		(0 or 1). Each docg3 chip (or floor) has 2 protection areas,

		which can cover any part of it, block aligned, called DPS.

		The protection has information embedded whether it blocks reads,

		writes or both.

		The protection key is a string of 8 bytes (value 0-255).

		Entering the correct value toggle the lock, and can be observed

		through f[0-3]_dps[01]_is_keylocked.

		Possible values are:

			- 8 bytes

		Typical values are:

			- "00000000"

			- "12345678"

Users:		None identified so far.

Documentation/ABI/testing/sysfs-driver-wacom

+9 −8
Original line number Original line Diff line number Diff line
@@ -15,9 +15,9 @@ Contact: linux-input@vger.kernel.org 
Description:

Description:

		Attribute group for control of the status LEDs and the OLEDs.

		Attribute group for control of the status LEDs and the OLEDs.

		This attribute group is only available for Intuos 4 M, L,

		This attribute group is only available for Intuos 4 M, L,

		and XL (with LEDs and OLEDs) and Cintiq 21UX2 (LEDs only).

		and XL (with LEDs and OLEDs) and Cintiq 21UX2 and Cintiq 24HD

		Therefore its presence implicitly signifies the presence of

		(LEDs only). Therefore its presence implicitly signifies the

		said LEDs and OLEDs on the tablet device.

		presence of said LEDs and OLEDs on the tablet device.





What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance

Date:		August 2011

Date:		August 2011
@@ -41,16 +41,17 @@ Date: August 2011 
Contact:	linux-input@vger.kernel.org

Contact:	linux-input@vger.kernel.org

Description:

Description:

		Writing to this file sets which one of the four (for Intuos 4)

		Writing to this file sets which one of the four (for Intuos 4)

		or of the right four (for Cintiq 21UX2) status LEDs is active (0..3).

		or of the right four (for Cintiq 21UX2 and Cintiq 24HD) status

		The other three LEDs on the same side are always inactive.

		LEDs is active (0..3). The other three LEDs on the same side are

		always inactive.





What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select

Date:		September 2011

Date:		September 2011

Contact:	linux-input@vger.kernel.org

Contact:	linux-input@vger.kernel.org

Description:

Description:

		Writing to this file sets which one of the left four (for Cintiq 21UX2)

		Writing to this file sets which one of the left four (for Cintiq 21UX2

		status LEDs is active (0..3). The other three LEDs on the left are always

		and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on

		inactive.

		the left are always inactive.





What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance

What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance

Date:		August 2011

Date:		August 2011

CRA Git | Maintained and supported by SUSTech CRA and CCSE