Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Dec 2007 04:18:25 +0000 (20:18 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Dec 2007 04:18:25 +0000 (20:18 -0800)
* 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


Trivial merge