Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
  V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
  V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
  V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
  V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
  V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
  V4L/DVB (4634): Zr36120: implement pcipci checks
  V4L/DVB (4632): Zoran: Implement pcipci failure check
  V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
  V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
  V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
  V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
  V4L/DVB (4627): Vivi crashes with mplayer
  V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
  V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
  V4L/DVB (4622): Copy-paste bug in videodev.c
  V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
  V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
  V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
  V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
  V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
  ...

diff --cc Documentation/feature-removal-schedule.txt
index 4ab4c425b856058d88b46bbe1070125e2c2bf3bb,9b9915044d3cec4da3dd5219317e20395e769015..9364f47c711690e4a262ed0c93c1072ff1be181e
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -46,8 -31,17 +46,8 @@@ Who: Jody McIntyre <scjody@modernduck.c
  
  ---------------------------
  
 -What: sbp2: module parameter "force_inquiry_hack"
 -When: July 2006
 -Why:  Superceded by parameter "workarounds". Both parameters are meant to be
 -      used ad-hoc and for single devices only, i.e. not in modprobe.conf,
 -      therefore the impact of this feature replacement should be low.
 -Who:  Stefan Richter <stefanr@s5r6.in-berlin.de>
 -
 ----------------------------
 -
  What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
- When: July 2006
+ When: December 2006
  Why:  V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
        series. The old API have lots of drawbacks and don't provide enough
        means to work with all video and audio standards. The newer API is

diff --cc drivers/media/dvb/ttusb-dec/ttusb_dec.c
Simple merge

diff --cc drivers/media/video/bt8xx/bttv-i2c.c
Simple merge

diff --cc drivers/media/video/cx88/cx88-i2c.c
Simple merge

diff --cc drivers/media/video/zoran_card.c
Simple merge

diff --cc include/media/v4l2-dev.h
index bb495b7f4680b112b96d82bad4a8320a29e91b11,c12d72d5f008935f24806d862e2822eff51527b6..6a11d772700ff649e9a1d81b47db9f8622af3594
--- 1/include/media/v4l2-dev.h
--- 2/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@@ -338,10 -339,8 +339,8 @@@ extern int video_usercopy(struct inode 
  #ifdef CONFIG_VIDEO_V4L1_COMPAT
  #include <linux/mm.h>
  
- extern struct video_device* video_devdata(struct file*);
- 
  #define to_video_device(cd) container_of(cd, struct video_device, class_dev)
 -static inline int
 +static inline int __must_check
  video_device_create_file(struct video_device *vfd,
                         struct class_device_attribute *attr)
  {