From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 25 Apr 2013 13:28:18 +0000 (-0300)
Subject: Merge branch 'topic/cx25821' into patchwork
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~10250^2~638
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a5d0568e2a686684ecdd1d6cb4edc48bceace249;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'topic/cx25821' into patchwork

* topic/cx25821: (31 commits)
  [media] cx25821: remove cx25821-audio-upstream.c from the Makefile
  [media] cx25821: replace custom ioctls with write()
  [media] cx25821: drop cx25821-video-upstream-ch2.c/h
  [media] cx25821: add output format ioctls
  [media] cx25821: prepare querycap for output support
  [media] cx25821: group all fmt functions together
  [media] cx25821: setup output nodes correctly
  [media] cx25821: remove references to subdevices that aren't there
  [media] cx25821: remove custom ioctls that duplicate v4l2 ioctls
  [media] cx25821: g/s/try/enum_fmt related fixes and cleanups
  [media] cx25821: switch to v4l2_fh, add event and prio handling
  [media] cx25821: replace resource management functions with fh ownership
  [media] cx25821: move vidq from cx25821_fh to cx25821_channel
  [media] cx25821: remove 'type' field from cx25821_fh
  [media] cx25821: use core locking
  [media] cx25821: remove unnecessary debug messages
  [media] cx25821: remove TRUE/FALSE/STATUS_(UN)SUCCESSFUL defines
  [media] cx25821: convert to the control framework
  [media] cx25821: embed video_device, clean up some kernel log spam
  [media] cx25821: remove bogus dependencies
  ...
---

a5d0568e2a686684ecdd1d6cb4edc48bceace249