diff options
author | Linus Torvalds | 2017-05-10 00:40:28 +0200 |
---|---|---|
committer | Linus Torvalds | 2017-05-10 00:40:28 +0200 |
commit | 4879b7ae05431ebcd228a4ff25a81120b3d85891 (patch) | |
tree | 921267ebdc9757ee770db6ef74032a6524d94bfa /net/mac80211/ibss.c | |
parent | Merge tag 'pwm/for-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Merge branch 'topic/pl330' into for-linus (diff) | |
download | kernel-qcow2-linux-4879b7ae05431ebcd228a4ff25a81120b3d85891.tar.gz kernel-qcow2-linux-4879b7ae05431ebcd228a4ff25a81120b3d85891.tar.xz kernel-qcow2-linux-4879b7ae05431ebcd228a4ff25a81120b3d85891.zip |
Merge tag 'dmaengine-4.12-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine updates from Vinod Koul:
"This time again a smaller update consisting of:
- support for TI DA8xx dma controller and updates to the cppi driver
- updates on bunch of drivers like xilinx, pl08x, stm32-dma, mv_xor,
ioat, dmatest"
* tag 'dmaengine-4.12-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (35 commits)
dmaengine: pl08x: remove lock documentation
dmaengine: pl08x: fix pl08x_dma_chan_state documentation
dmaengine: pl08x: Use the BIT() macro consistently
dmaengine: pl080: Fix some missing kerneldoc
dmaengine: pl080: Cut some unused defines
dmaengine: dmatest: Add check for supported buffer count (sg_buffers)
dmaengine: dmatest: Select DMA_ENGINE_RAID as its needed for the slave_sg test
dmaengine: virt-dma: Convert to use list_for_each_entry_safe()
dma-debug: use offset_in_page() macro
dmaengine: mv_xor: use offset_in_page() macro
dmaengine: dmatest: use offset_in_page() macro
dmaengine: sun4i: fix invalid argument
dmaengine: ioat: use setup_timer
dmaengine: cppi41: Fix an Oops happening in cppi41_dma_probe()
dmaengine: pl330: remove pdata based initialization
dmaengine: cppi: fix build error due to bad variable
dmaengine: imx-sdma: add 1ms delay to ensure SDMA channel is stopped
dmaengine: cppi41: use managed functions devm_*()
dmaengine: cppi41: fix cppi41_dma_tx_status() logic
dmaengine: qcom_hidma: pause the channel on shutdown
...
Diffstat (limited to 'net/mac80211/ibss.c')
0 files changed, 0 insertions, 0 deletions