aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 11:41:15 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 11:41:15 -0700
commitc39c06b96175a75e63da38dc3557a69e18a5f8ac (patch)
treeed7dbacb75768d3a21ef3be5fbc9b76865274bdd /kernel
parentMerge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff)
parentV4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option (diff)
downloadlinux-rng-c39c06b96175a75e63da38dc3557a69e18a5f8ac.tar.xz
linux-rng-c39c06b96175a75e63da38dc3557a69e18a5f8ac.zip
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"
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions