Commit 36b2e922 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v3.0-rc5' into sched/core 



Merge reason: Move to a (much) newer base.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents e197f094 b0af8dfd

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -518,6 +518,14 @@ N: Zach Brown 
E: zab@zabbo.net

D: maestro pci sound



M: David Brownell

D: Kernel engineer, mentor, and friend.  Maintained USB EHCI and

D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few

D: device drivers.  His encouragement also helped many engineers get

D: started working on the Linux kernel.  David passed away in early

D: 2011, and will be greatly missed.

W: https://lkml.org/lkml/2011/4/5/36



N: Gary Brubaker

E: xavyer@ix.netcom.com

D: USB Serial Empeg Empeg-car Mark I/II Driver

Documentation/00-INDEX

+2 −4
Original line number Diff line number Diff line
@@ -192,10 +192,6 @@ kernel-docs.txt 
	- listing of various WWW + books that document kernel internals.

kernel-parameters.txt

	- summary listing of command line / boot prompt args for the kernel.

keys-request-key.txt

	- description of the kernel key request service.

keys.txt

	- description of the kernel key retention service.

kobject.txt

	- info of the kobject infrastructure of the Linux kernel.

kprobes.txt
@@ -294,6 +290,8 @@ scheduler/ 
	- directory with info on the scheduler.

scsi/

	- directory with info on Linux scsi support.

security/

	- directory that contains security-related info

serial/

	- directory with info on the low level serial API.

serial-console.txt

Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870

0 → 100644
+56 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/<ambient light zone>_max

What:		/sys/class/backlight/<backlight>/l1_daylight_max

What:		/sys/class/backlight/<backlight>/l2_bright_max

What:		/sys/class/backlight/<backlight>/l3_office_max

What:		/sys/class/backlight/<backlight>/l4_indoor_max

What:		/sys/class/backlight/<backlight>/l5_dark_max

Date:		Mai 2011

KernelVersion:	2.6.40

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Control the maximum brightness for <ambient light zone>

		on this <backlight>. Values are between 0 and 127. This file

		will also show the brightness level stored for this

		<ambient light zone>.



What:		/sys/class/backlight/<backlight>/<ambient light zone>_dim

What:		/sys/class/backlight/<backlight>/l2_bright_dim

What:		/sys/class/backlight/<backlight>/l3_office_dim

What:		/sys/class/backlight/<backlight>/l4_indoor_dim

What:		/sys/class/backlight/<backlight>/l5_dark_dim

Date:		Mai 2011

KernelVersion:	2.6.40

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Control the dim brightness for <ambient light zone>

		on this <backlight>. Values are between 0 and 127, typically

		set to 0. Full off when the backlight is disabled.

		This file will also show the dim brightness level stored for

		this <ambient light zone>.



What:		/sys/class/backlight/<backlight>/ambient_light_level

Date:		Mai 2011

KernelVersion:	2.6.40

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Get conversion value of the light sensor.

		This value is updated every 80 ms (when the light sensor

		is enabled). Returns integer between 0 (dark) and

		8000 (max ambient brightness)



What:		/sys/class/backlight/<backlight>/ambient_light_zone

Date:		Mai 2011

KernelVersion:	2.6.40

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Get/Set current ambient light zone. Reading returns

		integer between 1..5 (1 = daylight, 2 = bright, ..., 5 = dark).

		Writing a value between 1..5 forces the backlight controller

		to enter the corresponding ambient light zone.

		Writing 0 returns to normal/automatic ambient light level

		operation. The ambient light sensing feature on these devices

		is an extension to the API documented in

		Documentation/ABI/stable/sysfs-class-backlight.

		It can be enabled by writing the value stored in

		/sys/class/backlight/<backlight>/max_brightness to

		/sys/class/backlight/<backlight>/brightness.
 
 No newline at end of file

Documentation/DocBook/dvb/dvbproperty.xml

+4 −1
Original line number Diff line number Diff line
@@ -141,13 +141,15 @@ struct dtv_properties { 
 </row></tbody></tgroup></informaltable>

</section>



<section>

	<title>Property types</title>

<para>

On <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>/<link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,

the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to

get/set up to 64 properties. The actual meaning of each property is described on the next sections.

</para>



<para>The Available frontend property types are:</para>

<para>The available frontend property types are:</para>

<programlisting>

#define DTV_UNDEFINED		0

#define DTV_TUNE		1
@@ -193,6 +195,7 @@ get/set up to 64 properties. The actual meaning of each property is described on 
#define DTV_ISDBT_LAYER_ENABLED	41

#define DTV_ISDBS_TS_ID		42

</programlisting>

</section>



<section id="fe_property_common">

	<title>Parameters that are common to all Digital TV standards</title>

Documentation/DocBook/media-entities.tmpl

+4 −3
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ 
<!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml">

<!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml">

<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">

<!ENTITY sub-srggb12 SYSTEM "v4l/pixfmt-srggb12.xml">

<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">

<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">

<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
@@ -373,9 +374,9 @@ 
<!ENTITY sub-media-indices SYSTEM "media-indices.tmpl">



<!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml">

<!ENTITY sub-media-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-func-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-func-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-func-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-ioc-device-info SYSTEM "v4l/media-ioc-device-info.xml">

<!ENTITY sub-media-ioc-enum-entities SYSTEM "v4l/media-ioc-enum-entities.xml">

<!ENTITY sub-media-ioc-enum-links SYSTEM "v4l/media-ioc-enum-links.xml">

CRA Git | Maintained and supported by SUSTech CRA and CCSE