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