Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (52 commits)
  [media] v4l: Document V4L2 control endianness as machine endianness
  [media] adp1653: Add driver for LED flash controller
  [media] v4l: Add flash control documentation
  [media] v4l: Add a class and a set of controls for flash devices
  [media] DocBook: document V4L2_CTRL_TYPE_BITMASK
  [media] vivi: add bitmask test control
  [media] v4l2-ctrls: add new bitmask control type
  [media] vivi: Fix sleep-in-atomic-context
  [media] DocBook: fix typo: vl42_plane_pix_format -> v4l2_plane_pix_format
  [media] v4l2-ctrls: always send an event if a control changed implicitly
  [media] v4l2-ctrls.c: copy-and-paste error: user_to_new -> new_to_user
  [media] pwc: clean-up header files
  [media] pwc: Enable power-management by default on tested models
  [media] pwc: Add a bunch of pwc custom API to feature-removal-schedule.txt
  [media] pwc: Add v4l2 controls for pan/tilt on Logitech QuickCam Orbit/Sphere
  [media] pwc: Allow dqbuf / read to complete while waiting for controls
  [media] pwc: Replace control code with v4l2-ctrls framework
  [media] pwc: properly allocate dma-able memory for ISO buffers
  [media] pwc: Allow multiple opens
  [media] pwc: Move various initialization to driver load and / or stream start
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index b1c921c27519a0953591b6a64159e46856e7558d,2042ee6db22fd28ee3f882aa294fa6d8ad764601..33fd99022286557cf7f42dc4d7c2f90823071b0a
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -584,24 -601,37 +584,57 @@@ Who:    Laurent Pinchart <laurent.pinchart
  
  ----------------------------
  
 -
 -----------------------------
 +What: For VIDIOC_S_FREQUENCY the type field must match the device node's type.
 +      If not, return -EINVAL.
 +When: 3.2
 +Why:  It makes no sense to switch the tuner to radio mode by calling
 +      VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by
 +      calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a
 +      move to more consistent handling of tv and radio tuners.
 +Who:  Hans Verkuil <hans.verkuil@cisco.com>
 +
 +----------------------------
 +
 +What: Opening a radio device node will no longer automatically switch the
 +      tuner mode from tv to radio.
 +When: 3.3
 +Why:  Just opening a V4L device should not change the state of the hardware
 +      like that. It's very unexpected and against the V4L spec. Instead, you
 +      switch to radio mode by calling VIDIOC_S_FREQUENCY. This is the second
 +      and last step of the move to consistent handling of tv and radio tuners.
 +Who:  Hans Verkuil <hans.verkuil@cisco.com>
 +
 +----------------------------
++
+ What: Support for driver specific ioctls in the pwc driver (everything
+       defined in media/pwc-ioctl.h)
+ When: 3.3
+ Why:  This stems from the v4l1 era, with v4l2 everything can be done with
+       standardized v4l2 API calls
+ Who:  Hans de Goede <hdegoede@redhat.com>
+ 
+ ----------------------------
+ 
+ What: Driver specific sysfs API in the pwc driver
+ When: 3.3
+ Why:  Setting pan/tilt should be done with v4l2 controls, like with other
+       cams. The button is available as a standard input device
+ Who:  Hans de Goede <hdegoede@redhat.com>
+ 
+ ----------------------------
+ 
+ What: Driver specific use of pixfmt.priv in the pwc driver
+ When: 3.3
+ Why:  The .priv field never was intended for this, setting a framerate is
+       support using the standardized S_PARM ioctl
+ Who:  Hans de Goede <hdegoede@redhat.com>
+ 
+ ----------------------------
+ 
+ What: Software emulation of arbritary resolutions in the pwc driver
+ When: 3.3
+ Why:  The pwc driver claims to support any resolution between 160x120
+       and 640x480, but emulates this by simply drawing a black border
+       around the image. Userspace can draw its own black border if it
+       really wants one.
+ Who:  Hans de Goede <hdegoede@redhat.com>

diff --cc drivers/media/video/v4l2-ioctl.c
Simple merge