summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-10-195-7/+10
|\
| * Net: DSA: Fix checking for get_phy_flags functionAndrew Lunn2014-10-191-1/+1
| * ipv6: fix a potential use after free in sit.cLi RongQing2014-10-181-3/+3
| * ipv6: fix a potential use after free in ip6_offload.cLi RongQing2014-10-181-0/+1
| * ipv4: fix a potential use after free in gre_offload.cLi RongQing2014-10-181-3/+3
| * tcp: fix build error if IPv6 is not enabledEric Dumazet2014-10-181-0/+2
* | Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2014-10-1950-692/+835
|\ \
| * | serial: atmel: add missing dmaengine headerVinod Koul2014-10-161-0/+1
| * | Merge branch 'topic/dma_control_fsl_acks' into for-linusVinod Koul2014-10-154-19/+44
| |\ \
| | * | dmaengine: remove FSLDMA_EXTERNAL_STARTVinod Koul2014-10-151-3/+0
| | * | dmaengine: freescale: remove FSLDMA_EXTERNAL_START control methodVinod Koul2014-10-151-9/+0
| | * | carma-fpga: move to fsl_dma_external_start()Vinod Koul2014-10-151-1/+2
| | * | carma-fpga: use dmaengine_xxx() APIVinod Koul2014-10-151-5/+4
| | * | dmaengine: freescale: add and export fsl_dma_external_start()Vinod Koul2014-10-152-1/+28
| | * | dmaengine: add dmaengine_prep_dma_sg() helperVinod Koul2014-10-151-0/+10
| * | | Merge branch 'topic/dma_control_cleanup_acks' into for-linusVinod Koul2014-10-158-17/+11
| |\ \ \
| | * | | video: mx3fb: use dmaengine_terminate_all() APIVinod Koul2014-10-151-2/+1
| | * | | serial: sh-sci: use dmaengine_terminate_all() APIVinod Koul2014-10-151-1/+1
| | * | | net: ks8842: use dmaengine_terminate_all() APIVinod Koul2014-10-151-4/+2
| | * | | mtd: sh_flctl: use dmaengine_terminate_all() APIVinod Koul2014-10-151-1/+1
| | * | | mtd: fsmc_nand: use dmaengine_terminate_all() APIVinod Koul2014-10-151-1/+1
| | * | | V4L2: mx3_camer: use dmaengine_pause() APIVinod Koul2014-10-151-4/+2
| | * | | dmaengine: coh901318: use dmaengine_terminate_all() APIVinod Koul2014-10-151-1/+1
| | * | | pata_arasan_cf: use dmaengine_terminate_all() APIVinod Koul2014-10-151-3/+2
| | |/ /
| * | | dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()Sebastian Andrzej Siewior2014-10-151-1/+1
| * | | dmaengine: dw: export probe()/remove() and Co to usersAndy Shevchenko2014-10-152-26/+30
| * | | dmaengine: dw: enable and disable controller when neededAndy Shevchenko2014-10-152-25/+36
| * | | dmaengine: dw: always export dw_dma_{en,dis}ableAndy Shevchenko2014-10-154-30/+12
| * | | dmaengine: dw: introduce dw_dma_on() helperAndy Shevchenko2014-10-151-2/+7
| * | | dmaengine: dw: split dma-dw.h to platform and private partsAndy Shevchenko2014-10-155-24/+47
| * | | dmaengine: dw: move private definitions to regs.hAndy Shevchenko2014-10-152-34/+29
| * | | dma: cppi41: Switch to using managed resource in probeKiran Padwal2014-10-151-11/+5
| * | | dmaengine: pl330: Fix NULL pointer dereference on driver unbindKrzysztof Kozlowski2014-10-151-2/+4
| * | | dmaengine: pl330: Fix NULL pointer dereference on probe failureKrzysztof Kozlowski2014-10-151-2/+4
| * | | dmaengine: pl330: Remove unused 'regs' variable in pl330_submit_req()Krzysztof Kozlowski2014-10-151-3/+0
| * | | dmaengine: pl330: Remove non-NULL check for pl330_submit_req parametersKrzysztof Kozlowski2014-10-151-4/+0
| * | | dma: imx-sdma: fix another incorrect __init annotationArnd Bergmann2014-09-281-1/+1
| * | | dmaengine: sun6i: Remove obsolete clk muxing codeChen-Yu Tsai2014-09-241-23/+0
| * | | dma: Kconfig: Include mx6 in the IMX_SDMA help sectionFabio Estevam2014-09-231-1/+1
| * | | dmatest: prevent memory leakage on error path in threadAndy Shevchenko2014-09-231-2/+2
| * | | dmaengine: Mark the struct dma_slave_config direction field deprecatedLaurent Pinchart2014-09-231-1/+3
| * | | dma: mv_xor: Add support for DMA_INTERRUPTLior Amsalem2014-09-232-5/+40
| * | | dma: mv_xor: Remove dead codeEzequiel Garcia2014-09-232-22/+0
| * | | dma: mv_xor: Reduce interrupts by enabling EOD only when neededLior Amsalem2014-09-232-5/+11
| * | | dma: mv_xor: Remove all interrupt magic numbersEzequiel Garcia2014-09-232-20/+30
| * | | dma: mv_xor: Remove multi-slot supportLior Amsalem2014-09-232-93/+32
| * | | dma: mv_xor: Simplify the DMA_MEMCPY operationLior Amsalem2014-09-231-65/+12
| * | | dma: mv_xor: Replace printk with dev_infoEzequiel Garcia2014-09-231-2/+3
| * | | dmaengine: qcom_adm: Add device tree bindingAndy Gross2014-09-231-0/+62
| * | | spi/pxa2xx-pci: Add support for Intel BraswellMika Westerberg2014-09-181-0/+37