commit 44e3ff32ac229a10a30b7b840f092f5b32a5f72a
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Sep 14 13:59:05 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Sep 14 13:59:05 2007 -0700
tree a219aced0374eda136b937b2c3f807464a346d92
parent 7a1fa065a0264f6b3d3003ba5635289f6583c478
parent e90ff9239e7636a191a8998a70cea220a2c58cdf

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