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/func-select.xml | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
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/func-select.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/func-select.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/func-select.xml b/Documentation/DocBook/media/v4l/func-select.xml index b6713623181f..e12a60d9bd85 100644 --- a/Documentation/DocBook/media/v4l/func-select.xml +++ b/Documentation/DocBook/media/v4l/func-select.xml | |||
| @@ -128,11 +128,3 @@ zero or greater than <constant>FD_SETSIZE</constant>.</para> | |||
| 128 | </variablelist> | 128 | </variablelist> |
| 129 | </refsect1> | 129 | </refsect1> |
| 130 | </refentry> | 130 | </refentry> |
| 131 | |||
| 132 | <!-- | ||
| 133 | Local Variables: | ||
| 134 | mode: sgml | ||
| 135 | sgml-parent-document: "v4l2.sgml" | ||
| 136 | indent-tabs-mode: nil | ||
| 137 | End: | ||
| 138 | --> | ||