diff options
author | 2012-02-15 16:24:37 -0500 | |
---|---|---|
committer | 2012-02-15 16:24:37 -0500 | |
commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /Documentation/DocBook/media/v4l/vidioc-g-ctrl.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/vidioc-g-ctrl.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml index 5146d00782e3..12b1d0503e26 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml @@ -127,11 +127,3 @@ this control belongs to.</para> </variablelist> </refsect1> </refentry> - -<!-- -Local Variables: -mode: sgml -sgml-parent-document: "v4l2.sgml" -indent-tabs-mode: nil -End: ---> |