From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 14 Sep 2007 20:59:05 +0000 (-0700)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.23-rc7~48
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=44e3ff32ac229a10a30b7b840f092f5b32a5f72a;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6220a): fix build error for et61x251 driver
  V4L/DVB (6188): Avoid a NULL pointer dereference during mpeg_open()
  V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option
  V4L/DVB (6148): Fix a warning at saa7191_probe
  V4L/DVB (6147): Pwc: Fix a broken debug message
  V4L/DVB (6144): Fix mux setup for composite sound on AverTV 307
  V4L/DVB (6095): ivtv: fix VIDIOC_G_ENC_INDEX flag handling
---

44e3ff32ac229a10a30b7b840f092f5b32a5f72a