From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Thu, 9 Oct 2014 17:00:54 +0000 (-0300)
Subject: Merge branch 'patchwork' into v4l_for_linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a66d05d504a24894a8fdf11e4569752f313e5764;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'patchwork' into v4l_for_linus

* patchwork: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

Conflicts:
	Documentation/DocBook/media/v4l/compat.xml
---

a66d05d504a24894a8fdf11e4569752f313e5764
diff --cc Documentation/DocBook/media/v4l/compat.xml
index 3a626d1b8f2e,7aa7c5d41e3b..07ffc76553ba
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@@ -2546,26 -2546,12 +2546,32 @@@ fields changed from _s32 to _u32
      </section>
  
      <section>
 +      <title>V4L2 in Linux 3.16</title>
 +      <orderedlist>
 +        <listitem>
 +	  <para>Added event V4L2_EVENT_SOURCE_CHANGE.
 +	  </para>
 +        </listitem>
 +      </orderedlist>
 +    </section>
 +
 +    <section>
 +      <title>V4L2 in Linux 3.17</title>
 +      <orderedlist>
 +        <listitem>
 +	  <para>Extended &v4l2-pix-format;. Added format flags.
 +	  </para>
 +        </listitem>
 +        <listitem>
 +	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
 +	  </para>
 +        </listitem>
+       <title>V4L2 in Linux 3.18</title>
+       <orderedlist>
+ 	<listitem>
+ 	  <para>Added <constant>V4L2_CID_PAN_SPEED</constant> and
+  <constant>V4L2_CID_TILT_SPEED</constant> camera controls.</para>
+ 	</listitem>
        </orderedlist>
      </section>