summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2017-02-25174-1296/+435
|\
| * IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating itBart Van Assche2017-01-2413-542/+18
| * IB/core: Remove ib_device.dma_deviceBart Van Assche2017-01-242-26/+22
| * nvme-rdma: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * RDS: net: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/srpt: Modify a debug statementBart Van Assche2017-01-241-2/+1
| * IB/srp: Switch from dma_device to dev.parentBart Van Assche2017-01-241-2/+2
| * IB/iser: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/IPoIB: Switch from dma_device to dev.parentBart Van Assche2017-01-242-2/+2
| * IB/rxe: Switch from dma_device to dev.parentBart Van Assche2017-01-241-3/+3
| * IB/vmw_pvrdma: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/usnic: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/qib: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/qedr: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/ocrdma: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/nes: Remove a superfluous assignment statementBart Van Assche2017-01-241-1/+0
| * IB/mthca: Switch from dma_device to dev.parentBart Van Assche2017-01-241-1/+1
| * IB/mlx5: Switch from dma_device to dev.parentBart Van Assche2017-01-242-8/+8
| * IB/mlx4: Switch from dma_device to dev.parentBart Van Assche2017-01-243-5/+5
| * IB/i40iw: Remove a superfluous assignment statementBart Van Assche2017-01-241-1/+0
| * IB/hns: Switch from dma_device to dev.parentBart Van Assche2017-01-242-2/+2
| * IB/hfi1: Switch from dma_device to dev.parentBart Van Assche2017-01-242-2/+2
| * IB/cxgb4: Set dev.parent instead of dma_deviceBart Van Assche2017-01-241-1/+1
| * IB/cxgb3: Set dev.parent instead of dma_deviceBart Van Assche2017-01-241-1/+1
| * IB/core: Use dev.parent instead of dma_deviceBart Van Assche2017-01-243-4/+4
| * IB/core: Initialize ib_device.dev.parent earlierBart Van Assche2017-01-242-1/+9
| * IB/qib: Remove DMA mapping codeBart Van Assche2017-01-242-173/+1
| * IB/hf1: Remove DMA mapping codeBart Van Assche2017-01-241-183/+0
| * IB/core: Change the type of an ib_dma_alloc_coherent() argumentBart Van Assche2017-01-242-10/+9
| * RDS: IB: Remove an unused structure memberBart Van Assche2017-01-241-1/+0
| * IB/core: Remove ib_dma_*map_single_attrs()Bart Van Assche2017-01-241-18/+0
| * lib/dma-virt: Add dma_virt_opsBart Van Assche2017-01-244-0/+79
| * lib/dma-noop: Only build dma_noop_ops for s390 and m32rBart Van Assche2017-01-244-1/+8
| * lib/dma-noop: Clarify a commentBart Van Assche2017-01-241-1/+1
| * treewide: Consolidate get_dma_ops() implementationsBart Van Assche2017-01-2431-64/+48
| * treewide: Consolidate set_dma_ops() implementationsBart Van Assche2017-01-244-16/+5
| * treewide: Move dma_ops from struct dev_archdata into struct deviceBart Van Assche2017-01-2436-70/+48
| * treewide: Constify most dma_map_ops structuresBart Van Assche2017-01-24113-227/+227
* | Merge tag 'fbdev-v4.11' of git://github.com/bzolnier/linuxLinus Torvalds2017-02-2534-531/+225
|\ \
| * | video: fbdev: fsl-diu-fb: fix spelling mistake "palette"Colin Ian King2017-02-202-4/+4
| * | fbdev: ssd1307fb: include linux/gpio/consumer.hArnd Bergmann2017-02-201-0/+1
| * | video: fbdev: fsl-diu-fb: remove impossible conditionSachin Shukla2017-02-081-8/+1
| * | video: fbdev: amifb: remove impossible conditionSachin Shukla2017-02-081-5/+3
| * | fbdev/ssd1307fb: clear screen in probeTomi Valkeinen2017-02-081-3/+2
| * | fbdev/ssd1307fb: add support to enable VBATTomi Valkeinen2017-02-082-1/+20
| * | fbdev: ssd1307fb: Make reset gpio devicetree property optionalJyri Sarha2017-02-082-8/+15
| * | fbdev: ssd1307fb: Remove reset-active-low from the DT binding documentJyri Sarha2017-02-081-2/+2
| * | fbdev: ssd1307fb: Start to use gpiod API for reset gpioJyri Sarha2017-02-081-17/+8
| * | video: fbdev: sh_mobile_lcdcfb: fix error return code in sh_mobile_lcdc_probe()Wei Yongjun2017-02-081-1/+3
| * | video: fbdev: offb: switch to using for_each_node_by_typeDmitry Torokhov2017-02-081-2/+2