Files
android_kernel_xiaomi_sm8450/include/linux
Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...
2013-02-26 09:24:48 -08:00
..
2013-01-02 17:36:10 -08:00
2013-01-02 17:36:10 -08:00
2012-11-30 12:37:36 +01:00
2013-01-03 14:34:06 -08:00
2012-10-08 13:50:20 +10:30
2012-12-02 00:05:12 +00:00
2012-09-20 14:31:45 +02:00
2013-02-14 09:21:15 -05:00
2012-12-20 13:57:36 -05:00
2012-12-21 20:23:41 +00:00
2013-01-29 10:48:30 +01:00
2012-11-08 16:58:31 +01:00
2012-12-24 09:36:38 -07:00
2012-09-30 18:02:20 -07:00
2012-11-28 11:54:40 +01:00
2012-10-16 18:49:15 -07:00
2012-11-22 13:43:27 +09:00
2013-01-24 09:04:04 +01:00
2012-11-28 21:49:02 -05:00
2012-11-28 21:49:02 -05:00
2012-11-08 16:58:30 +01:00
2012-11-21 10:07:48 +01:00
2013-01-25 21:03:54 -08:00
2012-11-23 12:23:40 +01:00
2013-02-06 15:59:47 -05:00
2012-12-14 13:05:26 +10:30
2013-01-29 13:59:57 -05:00
2012-09-07 14:57:45 -04:00
2012-09-11 10:15:02 +02:00
2012-11-21 15:09:26 -08:00
2013-01-10 11:44:38 -06:00
2013-01-29 19:32:58 -08:00
2012-11-20 16:15:02 +10:00
2012-11-03 14:50:15 -04:00
2012-10-10 01:15:44 -04:00
2012-12-12 17:38:33 -08:00
2013-01-21 17:18:20 +10:30
2012-12-14 13:06:40 +10:30
2012-12-25 18:45:06 -05:00
2012-12-11 17:22:27 -08:00
2012-10-17 15:53:02 -05:00
2012-10-10 22:41:05 -04:00
2013-01-24 15:37:26 +01:00
2013-01-03 15:57:14 -08:00
2013-01-23 13:44:00 -05:00
2012-11-16 14:33:04 -08:00
2012-10-06 03:05:01 +09:00
2012-09-27 12:45:28 +02:00
2013-02-19 08:43:34 +01:00
2013-02-03 15:09:26 -05:00
2012-12-18 15:02:13 -08:00
2012-12-18 15:02:14 -08:00
2013-02-10 19:41:08 -05:00
2012-12-24 09:36:38 -07:00
2013-02-14 09:21:15 -05:00
2012-08-21 16:28:31 +02:00
2012-10-09 16:22:32 +09:00
2013-01-15 22:43:15 -08:00
2013-02-08 18:28:04 +01:00
2012-09-05 17:21:36 -07:00
2013-01-25 15:06:01 -08:00