From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 26 Dec 2007 04:18:25 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.24-rc7~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2f68ad3b59d7015bf6fb0037ee0b5f2331aed28;p=linux-2.6-omap-h63xx.git

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
---

c2f68ad3b59d7015bf6fb0037ee0b5f2331aed28