diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 11:41:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 11:41:15 -0700 |
| commit | c39c06b96175a75e63da38dc3557a69e18a5f8ac (patch) | |
| tree | ed7dbacb75768d3a21ef3be5fbc9b76865274bdd /net/bridge/br_private.h | |
| parent | a78feb7c8a0687913f9869c05811054595a42a76 (diff) | |
| parent | b20c8e8e86190d60627a59d99ce2ac6ffcbc704d (diff) | |
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 'net/bridge/br_private.h')
0 files changed, 0 insertions, 0 deletions