summaryrefslogtreecommitdiff
path: root/sound/usb/caiaq/input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-09 22:27:08 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-09 22:27:08 -0500
commit9878f60240f786286ebfaa8ff9227ef38da1720c (patch)
treeb39c6b130ae03f217307f2cd3eb5e7659514a5e4 /sound/usb/caiaq/input.c
parentb66a8043d0baa9818a407ed857eada5cb21cd9bb (diff)
parent3e5d6897176d38b54124da56183810abbd68c8bc (diff)
Merge branch 'ena-bug-fixes'
Netanel Belgazal says: ==================== Bug Fixes in ENA driver Changes from V3: * Rebase patchset to master and solve merge conflicts. * Remove redundant bug fix (fix error handling when probe fails) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/usb/caiaq/input.c')
0 files changed, 0 insertions, 0 deletions
mmit/include/uapi/asm-generic/resource.h?h=nds-private-remove&id=e7aa8c2eb11ba69b1b69099c3c7bd6be3087b0ba'>HEADmaster
Pull documentation update from Jonathan Corbet: "These are the documentation changes for 4.10. It's another busy cycle for the docs tree, as the sphinx conversion continues. Highlights include: - Further work on PDF output, which remains a bit of a pain but should be more solid now. - Five more DocBook template files converted to Sphinx. Only 27 to go... Lots of plain-text files have also been converted and integrated. - Images in binary formats have been replaced with more source-friendly versions. - Various bits of organizational work, including the renaming of various files discussed at the kernel summit. - New documentation for the device_link mechanism. ... and, of course, lots of typo fixes and small updates" * tag 'docs-4.10' of git://git.lwn.net/linux: (193 commits) dma-buf: Extract dma-buf.rst Update Documentation/00-INDEX docs: 00-INDEX: document directories/files with no docs docs: 00-INDEX: remove non-existing entries docs: 00-INDEX: add missing entries for documentation files/dirs docs: 00-INDEX: consolidate process/ and admin-guide/ description scripts: add a script to check if Documentation/00-INDEX is sane Docs: change sh -> awk in REPORTING-BUGS Documentation/core-api/device_link: Add initial documentation core-api: remove an unexpected unident ppc/idle: Add documentation for powersave=off Doc: Correct typo, "Introdution" => "Introduction" Documentation/atomic_ops.txt: convert to ReST markup Documentation/local_ops.txt: convert to ReST markup Documentation/assoc_array.txt: convert to ReST markup docs-rst: parse-headers.pl: cleanup the documentation docs-rst: fix media cleandocs target docs-rst: media/Makefile: reorganize the rules docs-rst: media: build SVG from graphviz files docs-rst: replace bayer.png by a SVG image ...
Diffstat (limited to 'include/uapi/asm-generic/resource.h')