From: Linus Torvalds Date: Wed, 19 Sep 2007 18:41:15 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c39c06b96175a75e63da38dc3557a69e18a5f8ac;p=linux-beck.git 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" --- c39c06b96175a75e63da38dc3557a69e18a5f8ac