From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 13 Sep 2006 00:33:42 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: firefly_0821_release~33260^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7366935a498fcd3d87871518f71b67e43c62493d;hp=-c;p=firefly-linux-kernel-4.4.55.git

Merge /pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules
  V4L/DVB (4608b): i2c deps fix on DVB
  V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
  V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
  V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
  V4L/DVB (4494a): Fix compilation when V4L1 support is not present
---

7366935a498fcd3d87871518f71b67e43c62493d