From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 2 Mar 2007 01:25:23 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.21-rc3~150
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=100b425480d3a4c7dff4f99bead457d91ad19caf;p=linux-2.6

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 (5305): Mark VIDIOC_DBG_S/G_REGISTER as experimental
  V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.
  V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl
  V4L/DVB (5276): Cxusb: fix firmware patch for big endian systems
  V4L/DVB (5258): Cafe_ccic: fix compiler warning
  V4L/DVB (5295): Digitv: open nxt6000 i2c_gate for TDED4 tuner handling
  V4L/DVB (5304): Improve chip matching in v4l2_register
  V4L/DVB (5255): Fix cx25840 firmware loading.
---

100b425480d3a4c7dff4f99bead457d91ad19caf