Commit 744c62eb authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.5-rc5' into regulator-drivers 

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c
parents f141822b 6887a413

Documentation/DocBook/media/v4l/pixfmt.xml

+2 −2
Original line number Diff line number Diff line
@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry> 
	  <row id="V4L2-PIX-FMT-Y4">

	    <entry><constant>V4L2_PIX_FMT_Y4</constant></entry>

	    <entry>'Y04 '</entry>

	    <entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,

	    <entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,

the other bits are set to 0.</entry>

	  </row>

	  <row id="V4L2-PIX-FMT-Y6">

	    <entry><constant>V4L2_PIX_FMT_Y6</constant></entry>

	    <entry>'Y06 '</entry>

	    <entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,

	    <entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,

the other bits are set to 0.</entry>

	  </row>

	</tbody>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-g-tuner;

    &sub-log-status;

    &sub-overlay;

    &sub-prepare-buf;

    &sub-qbuf;

    &sub-querybuf;

    &sub-querycap;
@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark> 
    &sub-query-dv-preset;

    &sub-query-dv-timings;

    &sub-querystd;

    &sub-prepare-buf;

    &sub-reqbufs;

    &sub-s-hw-freq-seek;

    &sub-streamon;

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

+2 −3
Original line number Diff line number Diff line
@@ -108,10 +108,9 @@ information.</para> 
/></entry>

	  </row>

	  <row>

	    <entry>__u32</entry>

	    <entry>struct&nbsp;v4l2_format</entry>

	    <entry><structfield>format</structfield></entry>

	    <entry>Filled in by the application, preserved by the driver.

	    See <xref linkend="v4l2-format" />.</entry>

	    <entry>Filled in by the application, preserved by the driver.</entry>

	  </row>

	  <row>

	    <entry>__u32</entry>

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
	  <row>

	    <entry></entry>

	    <entry>&v4l2-event-frame-sync;</entry>

            <entry><structfield>frame</structfield></entry>

            <entry><structfield>frame_sync</structfield></entry>

	    <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>

	  </row>

	  <row>

Documentation/stable_kernel_rules.txt

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ Rules on what kind of patches are accepted, and which ones are not, into the 
   marked CONFIG_BROKEN), an oops, a hang, data corruption, a real

   security issue, or some "oh, that's not good" issue.  In short, something

   critical.

 - Serious issues as reported by a user of a distribution kernel may also

   be considered if they fix a notable performance or interactivity issue.

   As these fixes are not as obvious and have a higher risk of a subtle

   regression they should only be submitted by a distribution kernel

   maintainer and include an addendum linking to a bugzilla entry if it

   exists and additional information on the user-visible impact.

 - New device IDs and quirks are also accepted.

 - No "theoretical race condition" issues, unless an explanation of how the

   race can be exploited is also provided.