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

Merge branch 'master' into for-3.12/upstream 



Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents 6c2794a2 58c59bc9

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ modules.builtin 
*.bz2

*.lzma

*.xz

*.lz4

*.lzo

*.patch

*.gcno

Documentation/ABI/stable/sysfs-driver-ib_srp

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ Description: Interface for making ib_srp connect to a new target. 
		  ib_srp. Specifying a value that exceeds cmd_sg_entries is

		  only safe with partial memory descriptor list support enabled

		  (allow_ext_sg=1).

		* comp_vector, a number in the range 0..n-1 specifying the

		  MSI-X completion vector. Some HCA's allocate multiple (n)

		  MSI-X vectors per HCA port. If the IRQ affinity masks of

		  these interrupts have been configured such that each MSI-X

		  interrupt is handled by a different CPU then the comp_vector

		  parameter can be used to spread the SRP completion workload

		  over multiple CPU's.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006

Documentation/ABI/stable/sysfs-module

+7 −3
Original line number Diff line number Diff line
@@ -4,9 +4,13 @@ Description: 


	/sys/module/MODULENAME

		The name of the module that is in the kernel.  This

		module name will show up either if the module is built

		directly into the kernel, or if it is loaded as a

		dynamic module.

		module name will always show up if the module is loaded as a

		dynamic module.  If it is built directly into the kernel, it

		will only show up if it has a version or at least one

		parameter.



		Note: The conditions of creation in the built-in case are not

		by design and may be removed in the future.



	/sys/module/MODULENAME/parameters

		This directory contains individual files that are each

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Description: Generic performance monitoring events 


What: 		/sys/devices/cpu/events/PM_1PLUS_PPC_CMPL

		/sys/devices/cpu/events/PM_BRU_FIN

		/sys/devices/cpu/events/PM_BRU_MPRED

		/sys/devices/cpu/events/PM_BR_MPRED

		/sys/devices/cpu/events/PM_CMPLU_STALL

		/sys/devices/cpu/events/PM_CMPLU_STALL_BRU

		/sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS

Documentation/ABI/testing/sysfs-class-pwm

0 → 100644
+79 −0
Original line number Diff line number Diff line 
What:		/sys/class/pwm/

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		The pwm/ class sub-directory belongs to the Generic PWM

		Framework and provides a sysfs interface for using PWM

		channels.



What:		/sys/class/pwm/pwmchipN/

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		A /sys/class/pwm/pwmchipN directory is created for each

		probed PWM controller/chip where N is the base of the

		PWM chip.



What:		/sys/class/pwm/pwmchipN/npwm

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		The number of PWM channels supported by the PWM chip.



What:		/sys/class/pwm/pwmchipN/export

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Exports a PWM channel from the PWM chip for sysfs control.

		Value is between 0 and /sys/class/pwm/pwmchipN/npwm - 1.



What:		/sys/class/pwm/pwmchipN/unexport

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Unexports a PWM channel.



What:		/sys/class/pwm/pwmchipN/pwmX

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		A /sys/class/pwm/pwmchipN/pwmX directory is created for

		each exported PWM channel where X is the exported PWM

		channel number.



What:		/sys/class/pwm/pwmchipN/pwmX/period

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Sets the PWM signal period in nanoseconds.



What:		/sys/class/pwm/pwmchipN/pwmX/duty_cycle

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Sets the PWM signal duty cycle in nanoseconds.



What:		/sys/class/pwm/pwmchipN/pwmX/polarity

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Sets the output polarity of the PWM signal to "normal" or

		"inversed".



What:		/sys/class/pwm/pwmchipN/pwmX/enable

Date:		May 2013

KernelVersion:	3.11

Contact:	H Hartley Sweeten <hsweeten@visionengravers.com>

Description:

		Enable/disable the PWM signal.

		0 is disabled

		1 is enabled