Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
commitc39c06b96175a75e63da38dc3557a69e18a5f8ac
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:41:15 +0000 (19 11:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:41:15 +0000 (19 11:41 -0700)
treeed7dbacb75768d3a21ef3be5fbc9b76865274bdd
parenta78feb7c8a0687913f9869c05811054595a42a76
parentb20c8e8e86190d60627a59d99ce2ac6ffcbc704d
Merge /pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option
  Revert "V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option"