From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 26 Jun 2006 17:54:02 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.18-rc1~611
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5f2f444136abdb13dbd2094555aa65fc252aef6c;p=~emulex%2Finfiniband.git

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 (4227): Update this driver for recent header file movement.
  V4L/DVB (4223): Add V4L2_CID_MPEG_STREAM_VBI_FMT control
  V4L/DVB (4222): Always switch tuner mode when calling VIDIOC_S_FREQUENCY.
  V4L/DVB (4221): Add HM12 YUV format define.
  V4L/DVB (4219): Av7110: analog sound output of DVB-C rev 2.3
  V4L/DVB (4217): Fix a misplaced closing bracket/else, which caused swzigzag not to be called
  V4L/DVB (4215): Make VIDEO_CX88_BLACKBIRD a separate build option
  V4L/DVB (4214): Make VIDEO_CX2341X a selectable build option
  V4L/DVB (4213): Cx88: cleanups
  V4L/DVB (4211): Fix an Oops for all fe that have get_frontend_algo == NULL
---

5f2f444136abdb13dbd2094555aa65fc252aef6c