Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c39c06b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents a78feb7c b20c8e8e

Documentation/kernel-parameters.txt

+10 −10

File changed.

Contains only whitespace changes.