Merge branch 'master' into for-next (6396fc3b) · Commits · e / devices / android_kernel_teracube_2e

Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget

+12 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,15 @@ Description:
		0 -> resumed

		(_UDC_ is the name of the USB Device Controller driver)

		What: /sys/devices/platform/_UDC_/gadget/gadget-lunX/nofua
		Date: July 2010
		Contact: Andy Shevchenko <andy.shevchenko@gmail.com>
		Description:
		Show or set the reaction on the FUA (Force Unit Access) bit in
		the SCSI WRITE(10,12) commands when a gadget in USB Mass
		Storage mode.

		Possible values are:
		1 -> ignore the FUA flag
		0 -> obey the FUA flag

Documentation/DocBook/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
		pdfdocs: $(PDF)

		HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
		htmldocs: $(HTML)
		htmldocs: $(HTML) xmldoclinks
		$(call build_main_index)
		$(call build_images)

Documentation/DocBook/v4l/lirc_device_interface.xml

+16 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,22 @@ on working with the default settings initially.</para>
		and LIRC_SETUP_END. Drivers can also choose to ignore these ioctls.</para>
		</listitem>
		</varlistentry>
		<varlistentry>
		<term>LIRC_SET_WIDEBAND_RECEIVER</term>
		<listitem>
		<para>Some receivers are equipped with special wide band receiver which is intended
		to be used to learn output of existing remote.
		Calling that ioctl with (1) will enable it, and with (0) disable it.
		This might be useful of receivers that have otherwise narrow band receiver
		that prevents them to be used with some remotes.
		Wide band receiver might also be more precise
		On the other hand its disadvantage it usually reduced range of reception.
		Note: wide band receiver might be implictly enabled if you enable
		carrier reports. In that case it will be disabled as soon as you disable
		carrier reports. Trying to disable wide band receiver while carrier
		reports are active will do nothing.</para>
		</listitem>
		</varlistentry>
		</variablelist>

		</section>

Documentation/DocBook/v4l/pixfmt-packed-rgb.xml

+78 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para>
		<entry>r<subscript>1</subscript></entry>
		<entry>r<subscript>0</subscript></entry>
		</row>
		<row id="V4L2-PIX-FMT-BGR666">
		<entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
		<entry>'BGRH'</entry>
		<entry></entry>
		<entry>b<subscript>5</subscript></entry>
		<entry>b<subscript>4</subscript></entry>
		<entry>b<subscript>3</subscript></entry>
		<entry>b<subscript>2</subscript></entry>
		<entry>b<subscript>1</subscript></entry>
		<entry>b<subscript>0</subscript></entry>
		<entry>g<subscript>5</subscript></entry>
		<entry>g<subscript>4</subscript></entry>
		<entry></entry>
		<entry>g<subscript>3</subscript></entry>
		<entry>g<subscript>2</subscript></entry>
		<entry>g<subscript>1</subscript></entry>
		<entry>g<subscript>0</subscript></entry>
		<entry>r<subscript>5</subscript></entry>
		<entry>r<subscript>4</subscript></entry>
		<entry>r<subscript>3</subscript></entry>
		<entry>r<subscript>2</subscript></entry>
		<entry></entry>
		<entry>r<subscript>1</subscript></entry>
		<entry>r<subscript>0</subscript></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		</row>
		<row id="V4L2-PIX-FMT-BGR24">
		<entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
		<entry>'BGR3'</entry>
		@@ -700,6 +739,45 @@ defined in error. Drivers may interpret them as in <xref
		<entry>b<subscript>1</subscript></entry>
		<entry>b<subscript>0</subscript></entry>
		</row>
		<row id="V4L2-PIX-FMT-BGR666">
		<entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
		<entry>'BGRH'</entry>
		<entry></entry>
		<entry>b<subscript>5</subscript></entry>
		<entry>b<subscript>4</subscript></entry>
		<entry>b<subscript>3</subscript></entry>
		<entry>b<subscript>2</subscript></entry>
		<entry>b<subscript>1</subscript></entry>
		<entry>b<subscript>0</subscript></entry>
		<entry>g<subscript>5</subscript></entry>
		<entry>g<subscript>4</subscript></entry>
		<entry></entry>
		<entry>g<subscript>3</subscript></entry>
		<entry>g<subscript>2</subscript></entry>
		<entry>g<subscript>1</subscript></entry>
		<entry>g<subscript>0</subscript></entry>
		<entry>r<subscript>5</subscript></entry>
		<entry>r<subscript>4</subscript></entry>
		<entry>r<subscript>3</subscript></entry>
		<entry>r<subscript>2</subscript></entry>
		<entry></entry>
		<entry>r<subscript>1</subscript></entry>
		<entry>r<subscript>0</subscript></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		<entry></entry>
		</row>
		<row><!-- id="V4L2-PIX-FMT-BGR24" -->
		<entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
		<entry>'BGR3'</entry>

Documentation/feature-removal-schedule.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -360,14 +360,6 @@ When: 2.6.33
		Why: Should be implemented in userspace, policy daemon.
		Who: Johannes Berg <johannes@sipsolutions.net>

		---------------------------

		What: CONFIG_INOTIFY
		When: 2.6.33
		Why: last user (audit) will be converted to the newer more generic
		and more easily maintained fsnotify subsystem
		Who: Eric Paris <eparis@redhat.com>

		----------------------------

		What: sound-slot/service-* module aliases and related clutters in