Linus Torvalds
fba9569924
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
...
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
dmaengine/ep93xx_dma: add module.h include
pch_dma: Reduce wasting memory
pch_dma: Fix suspend issue
dma/timberdale: free_irq() on an error path
dma: shdma: transfer based runtime PM
dmaengine: shdma: protect against the IRQ handler
dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
serial: sh-sci: don't filter on DMA device, use only channel ID
ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
ASoC: Samsung: Update DMA interface
spi/s3c64xx: Merge dma control code
spi/s3c64xx: Add support DMA engine API
ARM: SAMSUNG: Remove S3C-PL330-DMA driver
ARM: S5P64X0: Use generic DMA PL330 driver
ARM: S5PC100: Use generic DMA PL330 driver
ARM: S5PV210: Use generic DMA PL330 driver
...
Fix up fairly trivial conflicts in
- arch/arm/mach-exynos4/{Kconfig,clock.c}
- arch/arm/mach-s5p64x0/dma.c
2011-11-04 18:02:25 -07:00
..
2011-11-04 18:02:25 -07:00
2011-10-28 12:02:27 -07:00
2011-03-10 15:16:29 +00:00
2009-02-01 11:01:22 +05:30
2009-12-12 13:08:14 +01:00
2011-07-07 15:31:05 +01:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:46 -07:00
2011-10-17 09:13:41 +01:00
2008-08-02 21:32:35 +01:00
2009-01-14 19:56:50 -08:00
2010-12-05 08:39:36 +00:00
2011-03-16 23:35:26 +00:00
2011-10-17 09:13:41 +01:00
2008-08-02 21:32:35 +01:00
2011-07-19 18:09:45 +02:00
2010-01-10 13:03:52 +00:00
2011-10-17 09:02:43 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-11-01 20:11:00 -07:00
2008-10-23 12:53:32 +01:00
2011-10-28 12:02:27 -07:00
2011-09-13 11:12:14 +02:00
2010-11-04 15:44:31 +00:00
2011-08-17 08:44:16 +01:00
2011-05-14 21:36:55 +01:00
2011-10-23 13:32:29 +01:00
2010-01-15 17:10:14 +09:00
2011-10-17 09:02:44 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-05-26 10:31:06 +01:00
2009-03-15 21:01:20 -04:00
2009-05-29 08:40:02 -07:00
2008-08-07 09:55:48 +01:00
2011-01-27 11:48:58 +00:00
2011-03-31 11:26:23 -03:00
2010-09-02 15:28:43 +01:00
2011-09-26 12:36:47 +01:00
2011-03-31 11:26:23 -03:00
2011-02-12 11:52:21 +00:00
2011-02-12 11:52:21 +00:00
2011-03-16 23:35:26 +00:00
2011-03-31 11:26:23 -03:00
2011-08-12 08:54:19 +01:00
2011-10-23 13:32:29 +01:00
2011-02-23 17:24:17 +00:00
2011-08-31 10:42:48 +01:00
2011-03-29 14:47:57 +02:00
2011-07-07 19:20:51 +01:00
2008-08-02 21:32:35 +01:00
2011-10-25 12:11:02 +02:00
2010-10-22 10:19:59 -07:00
2008-08-02 21:32:35 +01:00
2011-07-12 19:42:40 +08:00
2010-10-07 14:08:55 +01:00
2011-10-17 09:12:40 +01:00
2011-03-03 16:26:55 -05:00
2010-10-29 13:14:40 -05:00
2010-05-20 21:04:21 -05:00
2011-07-13 17:32:42 +00:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-10-31 14:08:10 +01:00
2008-08-02 21:32:35 +01:00
2009-12-12 13:08:14 +01:00
2008-09-06 12:10:45 +01:00
2010-10-27 21:41:39 +01:00
2011-10-13 12:53:53 -04:00
2009-12-11 06:34:09 -05:00
2010-10-01 22:35:19 -04:00
2011-09-13 11:12:14 +02:00
2011-08-13 11:26:40 +01:00
2008-08-02 21:32:35 +01:00
2008-12-14 13:22:51 +00:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-10-17 09:11:51 +01:00
2009-07-24 12:35:01 +01:00
2011-10-06 15:40:05 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-07-12 11:19:29 -05:00
2011-07-07 19:20:53 +01:00
2011-10-06 15:40:05 +01:00
2011-10-06 15:40:06 +01:00
2011-10-06 15:40:05 +01:00
2011-10-06 15:40:05 +01:00
2011-10-06 15:40:05 +01:00
2010-03-13 10:48:22 +00:00
2011-10-28 12:02:27 -07:00
2011-08-31 10:50:13 +01:00
2008-08-02 21:32:35 +01:00
2011-09-20 23:33:44 +01:00
2011-03-16 23:35:25 +00:00
2008-08-02 21:32:35 +01:00
2011-07-28 01:32:04 -06:00
2011-07-13 17:32:43 +00:00
2011-06-02 11:16:22 +01:00
2011-01-11 16:23:04 +00:00
2010-10-01 22:32:18 -04:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2011-07-22 23:08:48 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2009-06-11 21:01:52 +02:00
2010-10-18 22:34:25 +01:00
2011-02-11 12:29:18 +00:00
2011-10-23 13:32:33 +01:00
2011-10-23 13:32:29 +01:00
2009-10-12 13:26:31 -07:00
2008-08-02 21:32:35 +01:00
2008-10-01 17:24:04 +01:00
2009-12-14 23:55:32 +01:00
2011-05-23 17:19:26 +01:00
2010-06-14 21:31:00 -04:00
2009-02-12 13:21:17 +00:00
2008-08-02 21:32:35 +01:00
2008-09-04 09:46:11 +01:00
2008-11-27 12:37:59 +00:00
2011-09-20 23:33:36 +01:00
2009-10-25 15:59:53 +00:00
2011-10-25 08:19:59 +01:00
2011-07-06 20:49:45 +01:00
2010-08-10 13:47:39 -07:00
2008-08-02 21:32:35 +01:00
2008-08-02 21:32:35 +01:00
2010-10-01 22:32:18 -04:00
2011-04-10 21:13:36 +01:00
2008-08-07 09:55:48 +01:00
2011-05-25 08:39:14 -07:00
2011-10-06 15:40:05 +01:00
2011-02-02 21:23:29 +00:00
2011-10-17 09:02:43 +01:00
2011-07-22 17:19:02 +01:00
2011-03-23 19:47:18 -07:00
2010-11-04 15:44:31 +00:00
2011-03-31 11:26:23 -03:00
2008-08-02 21:32:35 +01:00
2009-09-18 23:30:11 +01:00
2011-09-17 12:50:57 +01:00
2009-02-19 11:26:24 +00:00
2011-03-10 15:16:29 +00:00
2008-08-02 21:32:35 +01:00
2010-07-09 14:41:34 +01:00
2011-07-12 11:19:29 -05:00
2008-08-02 21:32:35 +01:00