]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:41:15 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Sep 2007 18:41:15 +0000 (11:41 -0700)
commite0b145a1d2b51e00ece12ee6fd476810d223a535
treeed7dbacb75768d3a21ef3be5fbc9b76865274bdd
parent76f516b4c96159db8e3722b7c5fe84be24f935ec
parent7fe6edec886266c00a18f4d815cc6d2ba77bc329
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"