diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /Documentation/DocBook/media/v4l/dev-raw-vbi.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.gz linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.bz2 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-raw-vbi.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/dev-raw-vbi.xml b/Documentation/DocBook/media/v4l/dev-raw-vbi.xml index c5a70bdfaf27..b788c72c885e 100644 --- a/Documentation/DocBook/media/v4l/dev-raw-vbi.xml +++ b/Documentation/DocBook/media/v4l/dev-raw-vbi.xml @@ -337,11 +337,3 @@ an &EBUSY; if the required hardware resources are temporarily unavailable, for example the device is already in use by another process.</para> </section> - - <!-- -Local Variables: -mode: sgml -sgml-parent-document: "v4l2.sgml" -indent-tabs-mode: nil -End: - --> |