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

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6876): ivtv: mspx4xx needs a longer i2c udelay
  V4L/DVB (6871): Kconfig: VIDEO_CX23885 must select DVB_LGDT330X
This commit is contained in:
Linus Torvalds 2007-12-25 20:18:25 -08:00
commit c2f68ad3b5
2 changed files with 4 additions and 0 deletions