tree ed7dbacb75768d3a21ef3be5fbc9b76865274bdd
parent a78feb7c8a0687913f9869c05811054595a42a76
parent b20c8e8e86190d60627a59d99ce2ac6ffcbc704d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227275 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227275 -0700

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 (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"