tree 6fc81951443d793897bb96639af42f997f6f2f6e
parent 3ee4b889a0708e6503dca0f771c2d84f56602a18
parent e7ea8fc285c5ac9040ae80b01d529ea453f1b647
author Linus Torvalds <torvalds@g5.osdl.org> 1158107622 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1158107622 -0700

Merge master.kernel.org:/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