diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 22:24:37 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 22:24:37 +0100 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /Documentation/DocBook/media/v4l/dev-overlay.xml | |
| parent | rtlwifi: Modify rtl_pci_init to return 0 on success (diff) | |
| parent | ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status (diff) | |
| download | linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.xz linux-ca994a36f585432458ead9133fcfe05440edbb7b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'Documentation/DocBook/media/v4l/dev-overlay.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-overlay.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/dev-overlay.xml b/Documentation/DocBook/media/v4l/dev-overlay.xml index 92513cf79150..40d1d7681439 100644 --- a/Documentation/DocBook/media/v4l/dev-overlay.xml +++ b/Documentation/DocBook/media/v4l/dev-overlay.xml @@ -369,11 +369,3 @@ reasons. <!-- video4linux-list@redhat.com on 22 Oct 2002 subject <para>To start or stop the frame buffer overlay applications call the &VIDIOC-OVERLAY; ioctl.</para> </section> - - <!-- -Local Variables: -mode: sgml -sgml-parent-document: "v4l2.sgml" -indent-tabs-mode: nil -End: - --> |