From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 19 Apr 2012 20:38:58 +0000 (-0300)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20120430~64^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a43f0bc4ed82cf3f637e3b8501644d67c1181ac;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (3776 commits)
  [media] V4L: fix a compiler warning
  [media] vivi: fix duplicate line
  [media] v4l2-ctrls.c: zero min/max/step/def values for 64 bit integers
  [media] V4L2: drivers implementing vidioc_default should also return -ENOTTY
  [media] V4L: fix incorrect refcounting
  [media] pluto2: remove some dead code
  [media] drivers: media: dvb: ddbridge: ddbridge-code: Remove unneeded include of version.h
  [media] drivers: media: radio: radio-keene.c: Remove unneeded include of version.h
  [media] drivers: media: video: adp1653.c: Remove unneeded include of version.h
  [media] tm6000: don't use KERNEL_VERSION
  [media] tlg2300: Remove usage of KERNEL_VERSION()
  [media] dib0700: add new USB PID for the Elgato EyeTV DTT stick
  [media] video: vicam: Add MODULE_FIRMWARE
  [media] staging: go7007: Add MODULE_FIRMWARE
  [media] dib7000p: remove duplicate code and comment
  [media] videodev2.h: Fix VIDIOC_QUERYMENU ioctl regression
  [media] au8522_common: dont EXPORT_SYMBOL(au8522_led_gpio_enable)
  [media] au8522_common: add missing MODULE_LICENSE
  [media] au8522: build ATV/DTV demodulators as separate modules
  [media] au0828-dvb: attach tuner based on dev->board.tuner_type on hvr950q
  ...

Conflicts:
	drivers/media/common/tuners/xc5000.c
	drivers/media/common/tuners/xc5000.h
---

2a43f0bc4ed82cf3f637e3b8501644d67c1181ac