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
2012-10-19 18:46:51 +01:00
2012-09-17 20:55:54 +01:00
2012-06-30 10:15:07 +01:00
2012-11-19 22:22:15 +00:00
2012-09-08 10:20:09 +01:00
2012-11-30 12:57:08 +00:00
2012-11-05 20:39:54 +00:00
2012-12-05 10:55:54 -08:00
2012-10-15 10:05:43 +08:00
2012-09-19 17:42:17 +02:00
2012-09-17 07:35:08 -04:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-11-28 19:18:00 +00:00
2012-10-09 07:07:14 +09:00
2012-05-14 13:17:49 -07:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:16:40 +02:00
2012-11-19 17:44:54 +01:00
2012-09-14 11:17:21 +02:00
2012-09-22 01:07:21 -07:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:10 +02:00
2012-11-21 11:02:44 -08:00
2012-06-10 18:41:40 +02:00
2012-08-24 17:42:10 -07:00
2012-07-11 15:36:45 -07:00
2012-09-06 15:58:04 -07:00
2012-11-05 09:55:33 +01:00
2013-02-12 16:15:10 -05:00
2012-11-05 09:55:32 +01:00
2012-12-07 14:46:56 +09:00
2012-11-15 20:50:34 +08:00
2012-09-14 11:16:40 +02:00
2013-01-07 17:35:57 +01:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-10-15 10:03:17 +08:00
2012-09-14 11:18:10 +02:00
2012-11-20 15:59:00 +01:00
2013-01-14 10:51:08 +01:00
2012-11-16 10:35:08 -06:00
2012-09-19 17:39:52 +02:00
2012-04-18 13:52:35 -07:00
2012-05-02 00:10:49 -07:00
2012-09-14 11:17:36 +02:00
2012-09-24 14:44:38 +08:00
2012-05-18 00:00:45 +02:00
2012-11-02 12:00:36 -07:00
2012-12-10 11:23:25 +01:00
2012-09-19 17:42:18 +02:00
2012-11-19 09:57:16 +01:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-10-06 13:20:33 +02:00
2012-09-14 11:18:59 +02:00
2013-02-14 15:04:40 +01:00
2013-01-08 09:44:06 +01:00
2012-05-22 06:48:02 -07:00
2013-02-10 17:42:43 +00:00
2012-12-03 18:48:23 +01:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:19 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:19:00 +02:00
2012-09-19 17:39:52 +02:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:59 +02:00
2012-09-14 11:16:54 +02:00
2012-09-19 17:39:52 +02:00
2012-09-19 17:42:17 +02:00
2012-09-19 17:42:17 +02:00
2012-09-11 18:32:43 +08:00
2012-09-13 11:56:41 +08:00
2012-10-17 12:03:18 -07:00
2012-09-24 19:12:29 +08:00
2012-09-19 17:42:18 +02:00
2012-10-06 03:04:53 +09:00
2012-10-06 03:04:53 +09:00
2013-02-21 17:22:25 -08:00
2012-09-20 18:07:23 -07:00
2012-12-24 16:32:34 +00:00
2012-10-23 02:40:10 -04:00
2012-09-23 21:08:33 -07:00
2012-08-16 12:12:25 -07:00
2013-02-06 09:57:56 -08:00
2012-09-14 11:18:57 +02:00
2013-02-03 20:37:42 +01:00
2012-10-05 22:35:16 -03:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:17:35 +02:00
2012-09-19 17:42:17 +02:00
2012-09-14 11:17:21 +02:00
2012-12-12 11:45:16 -08:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:18:57 +02:00
2012-06-13 13:13:37 +01:00
2012-09-14 08:14:07 +05:30
2012-09-14 11:18:10 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2013-01-14 09:55:19 -08:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2013-02-01 14:10:11 -08:00
2012-09-19 17:42:17 +02:00
2012-07-30 17:25:12 -07:00
2012-09-10 16:34:00 -07:00
2012-10-30 11:10:00 -07:00
2012-11-07 09:35:53 -08:00
2012-12-07 12:54:31 +09:00
2012-10-29 20:49:44 -06:00
2012-09-14 11:18:10 +02:00
2012-11-21 08:55:22 +01:00
2012-11-05 09:55:29 +01:00
2012-11-19 23:56:59 +01:00
2012-11-16 11:35:30 +00:00
2012-12-06 13:54:51 -05:00
2012-10-04 09:11:57 -07:00
2013-02-14 15:14:32 -08:00
2012-11-16 11:35:29 +00:00
2013-01-18 15:06:30 +02:00
2012-08-22 19:34:51 +01:00
2012-09-14 11:17:21 +02:00
2012-12-14 14:50:09 -08:00
2013-01-15 23:00:38 -08:00
2012-09-18 12:28:22 +02:00
2012-09-23 21:08:35 -07:00
2012-12-05 23:14:38 +00:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:59 +02:00
2013-01-26 17:00:04 +08:00
2012-09-19 17:42:18 +02:00
2012-04-18 10:26:37 -06:00
2012-11-05 23:50:27 +01:00
2012-09-19 17:42:18 +02:00
2013-01-27 17:37:24 +00:00
2012-10-24 15:39:08 -07:00
2012-10-27 16:28:32 +05:30
2013-01-11 12:12:07 -08:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-09-19 17:42:17 +02:00
2012-09-19 17:42:18 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:19:00 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2013-02-13 13:22:49 +02:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2013-02-14 00:22:53 +01:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:17:35 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:59 +02:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:58 +02:00
2012-09-19 17:39:52 +02:00
2012-04-05 01:43:02 -04:00
5115f3c19d