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

Commit 7a04c4cb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup

parents f8cf8e47 fbe01f51

Documentation/DocBook/media/v4l/controls.xml

+19 −19
Original line number Original line Diff line number Diff line
@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-vui-sar-idc">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>

	      </row>

	      </row>
@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>

	      </row>

	      </row>
@@ -1641,7 +1641,7 @@ Possible values are:</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>

	      </row>

	      </row>
@@ -1689,9 +1689,9 @@ Possible values are:</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_profile</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">The profile information for H264.

	      <row><entry spanname="descr">The profile information for H264.

Applicable to the H264 encoder.

Applicable to the H264 encoder.
@@ -1774,9 +1774,9 @@ Possible values are:</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mpeg4_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_profile</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">The profile information for MPEG4.

	      <row><entry spanname="descr">The profile information for MPEG4.

Applicable to the MPEG4 encoder.

Applicable to the MPEG4 encoder.
@@ -1820,9 +1820,9 @@ Applicable to the encoder. 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-multi-slice-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_multi_slice_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_multi_slice_mode</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.

	      <row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.

Applicable to the encoder.

Applicable to the encoder.
@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-loop-filter-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_loop_filter_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_loop_filter_mode</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">Loop filter mode for H264 encoder.

	      <row><entry spanname="descr">Loop filter mode for H264 encoder.

Possible values are:</entry>

Possible values are:</entry>
@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-entropy-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_symbol_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_entropy_mode</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.

	      <row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.

Applicable to the H264 encoder.

Applicable to the H264 encoder.
@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry> 
	      </row>

	      </row>





	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-header-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_header_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_header_mode</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">Determines whether the header is returned as the first buffer or is

	      <row><entry spanname="descr">Determines whether the header is returned as the first buffer or is

it returned together with the first frame. Applicable to encoders.

it returned together with the first frame. Applicable to encoders.
@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE 
Applicable to the H264 encoder.</entry>

Applicable to the H264 encoder.</entry>

	      </row>

	      </row>

	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-frame-skip-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_frame_skip_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_frame_skip_mode</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">

	      <row><entry spanname="descr">

Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then

Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders. 
</entry>

</entry>

	      </row>

	      </row>

	      <row><entry></entry></row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-force-frame-type">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_force_frame_type</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_force_frame_type</entry>

	      </row>

	      </row>

	      <row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.

	      <row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.

Possible values are:</entry>

Possible values are:</entry>

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -592,3 +592,11 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
	interface that was used by acer-wmi driver. It will replaced by

	interface that was used by acer-wmi driver. It will replaced by

	information log when acer-wmi initial.

	information log when acer-wmi initial.

Who:    Lee, Chun-Yi <jlee@novell.com>

Who:    Lee, Chun-Yi <jlee@novell.com>



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

What:	The XFS nodelaylog mount option

When:	3.3

Why:	The delaylog mode that has been the default since 2.6.39 has proven

	stable, and the old code is in the way of additional improvements in

	the log code.

Who:	Christoph Hellwig <hch@lst.de>

Documentation/hwmon/max16065

+7 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,13 @@ can be safely used to identify the chip. You will have to instantiate 
the devices explicitly. Please see Documentation/i2c/instantiating-devices for

the devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.

details.





WARNING: Do not access chip registers using the i2cdump command, and do not use

any of the i2ctools commands on a command register (0xa5 to 0xac). The chips

supported by this driver interpret any access to a command register (including

read commands) as request to execute the command in question. This may result in

power loss, board resets, and/or Flash corruption. Worst case, your board may

turn into a brick.







Sysfs entries

Sysfs entries

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

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

Documentation/ioctl/ioctl-number.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -319,4 +319,6 @@ Code Seq#(hex) Include File Comments 
					<mailto:thomas@winischhofer.net>

					<mailto:thomas@winischhofer.net>

0xF4	00-1F	video/mbxfb.h		mbxfb

0xF4	00-1F	video/mbxfb.h		mbxfb

					<mailto:raph@8d.com>

					<mailto:raph@8d.com>

0xF6	all	LTTng			Linux Trace Toolkit Next Generation

					<mailto:mathieu.desnoyers@efficios.com>

0xFD	all	linux/dm-ioctl.h
 
0xFD	all	linux/dm-ioctl.h

MAINTAINERS

+4 −4
Original line number Original line Diff line number Diff line
@@ -2649,11 +2649,11 @@ F: drivers/net/wan/dlci.c 
F:	drivers/net/wan/sdla.c

F:	drivers/net/wan/sdla.c





FRAMEBUFFER LAYER

FRAMEBUFFER LAYER

M:	Paul Mundt <lethal@linux-sh.org>

M:	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

L:	linux-fbdev@vger.kernel.org

L:	linux-fbdev@vger.kernel.org

W:	http://linux-fbdev.sourceforge.net/

W:	http://linux-fbdev.sourceforge.net/

Q:	http://patchwork.kernel.org/project/linux-fbdev/list/

Q:	http://patchwork.kernel.org/project/linux-fbdev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git

T:	git git://github.com/schandinat/linux-2.6.git fbdev-next

S:	Maintained

S:	Maintained

F:	Documentation/fb/

F:	Documentation/fb/

F:	Documentation/devicetree/bindings/fb/

F:	Documentation/devicetree/bindings/fb/
@@ -4450,8 +4450,8 @@ M: "David S. Miller" <davem@davemloft.net> 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net

W:	http://www.linuxfoundation.org/en/Net

W:	http://patchwork.ozlabs.org/project/netdev/list/

W:	http://patchwork.ozlabs.org/project/netdev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

S:	Maintained

S:	Maintained

F:	net/

F:	net/

F:	include/net/

F:	include/net/