Linus Torvalds c511dc1fb6
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ...
Pull slave-dmaengine update from Vinod Koul:
"This time we have a new dmaengine driver from the tegra folks. Also
we have Guennadi's cleanup of sh drivers which incudes a library for
sh drivers. And the usual odd fixes in bunch of drivers and some nice
cleanup of dw_dmac from Andy."
Fix up conflicts in drivers/mmc/host/sh_mmcif.c
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
dmaengine: Cleanup logging messages
mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
dma: sh: provide a migration path for slave drivers to stop using .private
dma: sh: use an integer slave ID to improve API compatibility
dmaengine: shdma: prepare to stop using struct dma_chan::private
sh: remove unused DMA device pointer from SIU platform data
ASoC: siu: don't use DMA device for channel filtering
dmaengine: shdma: (cosmetic) simplify a static function
dmaengine: at_hdmac: add a few const qualifiers
dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
dw_dmac: mark dwc_dump_lli inline
dma: mxs-dma: Export missing symbols from mxs-dma.c
dma: shdma: convert to the shdma base library
ASoC: fsi: prepare for conversion to the shdma base library
usb: renesas_usbhs: prepare for conversion to the shdma base library
ASoC: siu: prepare for conversion to the shdma base library
serial: sh-sci: prepare for conversion to the shdma base library
mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
dma: shdma: prepare for conversion to the shdma base library
...
2012-07-24 17:12:54 -07:00
2012-05-25 09:31:59 -07:00
2012-07-17 15:11:37 -04:00
2012-07-20 12:31:05 +02:00
2012-07-17 19:35:59 -07:00
2012-05-20 10:06:08 -03:00
2012-06-19 15:24:34 -07:00
2012-07-24 13:37:37 -07:00
2012-07-24 13:56:26 -07:00
2012-07-24 17:12:54 -07:00
2012-06-01 16:55:42 -07:00
2012-07-04 19:51:50 +02:00
2012-06-07 14:58:38 +02:00
2012-05-31 18:18:11 -07:00
2012-07-03 21:51:08 +02:00
2012-07-24 16:40:57 -07:00
2012-06-26 06:55:23 -07:00
2012-05-22 13:54:18 +10:00
2012-07-22 19:32:00 +01:00
2012-05-29 16:22:33 -07:00
2012-06-28 17:37:00 -07:00
2012-06-06 15:20:22 -04:00
2012-05-31 20:29:58 -04:00
2012-07-24 10:01:50 -07:00
2012-07-05 01:33:59 -07:00
2012-05-29 16:22:29 -07:00
2012-05-15 20:14:35 -04:00
2012-05-19 12:17:35 -06:00
2012-06-15 08:46:23 +02:00
2012-07-11 16:04:49 -07:00
2012-05-29 16:22:20 -07:00
2012-07-04 13:07:05 +02:00
2012-07-17 21:37:27 +02:00
2012-07-11 15:36:43 -07:00
2012-07-11 17:58:46 -07:00
2012-07-24 16:40:57 -07:00
2012-05-25 01:44:51 +02:00
2012-06-03 20:05:57 -07:00
2012-05-31 17:49:32 -07:00
2012-06-18 09:47:00 -04:00
2012-07-19 08:34:37 -07:00
2012-05-31 17:49:29 -07:00
2012-07-19 00:03:17 +02:00
2012-05-31 17:49:28 -07:00
2012-07-14 16:34:14 +04:00
2012-07-23 12:17:00 +02:00
2012-05-25 12:46:23 +05:30
2012-05-21 15:09:37 +02:00
2012-06-20 15:38:27 +01:00
2012-07-19 10:39:00 +02:00
2012-05-28 19:13:50 -03:00
2012-06-01 12:12:01 -04:00
2012-07-16 22:38:27 -07:00
2012-06-27 15:42:24 -07:00
2012-05-31 17:49:32 -07:00
2012-07-17 21:37:27 +02:00
2012-05-29 23:28:33 -04:00
2012-06-01 16:57:51 -07:00
2012-07-22 23:57:58 +04:00
2012-05-21 20:27:36 -07:00
2012-05-24 12:57:47 -07:00
2012-07-23 00:01:29 +04:00
2012-05-30 21:04:53 -04:00
2012-06-28 13:52:15 -04:00
2012-05-16 20:00:27 -04:00
2012-07-24 00:01:30 -07:00
2012-05-21 15:09:33 +02:00
2012-07-05 15:04:10 +02:00
2012-07-09 16:23:33 +02:00
2012-07-11 23:34:39 +02:00
2012-05-29 16:22:21 -07:00
2012-05-25 12:48:26 -04:00
2012-05-22 16:02:13 -07:00
2012-06-04 16:49:43 +02:00
2012-07-24 14:13:59 +02:00
2012-05-17 19:06:13 -04:00
2012-07-02 15:11:12 +02:00
2012-05-22 17:13:11 -04:00
2012-06-19 21:39:50 +02:00
2012-07-20 11:07:00 -07:00
2012-07-20 11:07:00 -07:00
2012-07-18 09:36:12 -07:00
2012-06-30 01:08:00 -07:00
2012-05-17 15:49:51 -04:00
2012-06-12 15:25:46 -07:00
2012-07-02 12:34:22 -07:00
2012-06-11 23:57:22 -07:00
2012-06-08 12:15:43 +02:00
2012-05-23 22:11:12 -04:00
2012-07-11 18:22:32 +10:00
2012-07-23 12:17:00 +02:00
2012-05-31 17:49:31 -07:00
2012-07-18 08:59:58 -07:00
2012-05-23 13:49:23 -04:00
2012-07-22 12:19:36 -07:00
2012-05-19 12:41:56 -06:00
2012-05-27 08:12:42 -04:00
2012-05-15 23:34:37 +02:00
2012-07-06 10:53:49 +02:00
2012-05-29 16:22:32 -07:00
2012-07-24 13:40:06 +02:00
2012-05-31 17:49:32 -07:00
2012-05-29 16:22:21 -07:00
2012-07-21 13:58:17 -07:00
2012-05-31 17:49:30 -07:00
2012-07-02 12:34:23 -07:00
2012-05-31 17:49:28 -07:00
2012-07-21 10:34:00 -07:00
2012-06-04 11:43:00 -04:00
2012-07-24 12:01:20 -07:00
2012-05-30 11:43:10 +02:00
2012-05-29 16:22:29 -07:00
2012-05-29 16:22:32 -07:00
2012-05-29 16:22:31 -07:00
2012-05-29 23:28:41 -04:00
2012-07-01 03:34:50 -07:00
2012-07-11 16:04:50 -07:00
2012-05-29 16:22:28 -07:00
2012-05-29 16:22:20 -07:00
2012-05-22 15:20:28 -04:00
2012-07-01 03:34:50 -07:00
2012-07-19 15:51:36 -04:00
2012-05-16 15:24:36 -04:00
2012-05-16 15:23:46 -04:00
2012-05-29 16:22:28 -07:00
2012-06-20 14:39:35 -07:00
2012-07-11 10:20:47 -07:00
2012-05-29 16:22:20 -07:00
2012-07-24 13:34:56 -07:00
2012-06-08 14:58:13 +09:30
2012-05-31 17:49:27 -07:00
2012-07-03 13:22:37 +08:00
2012-07-14 16:35:40 +04:00
2012-07-22 12:44:01 -07:00
2012-07-20 11:06:59 -07:00
2012-06-16 15:40:02 +02:00
2012-06-16 15:40:02 +02:00
2012-06-22 02:49:52 +02:00
2012-06-29 16:46:06 -07:00
2012-07-17 09:02:36 -07:00
2012-07-09 16:42:24 -04:00
2012-05-26 14:17:30 -04:00
2012-06-18 08:45:16 -04:00
2012-05-24 16:15:48 -04:00
2012-07-14 16:33:08 +04:00
2012-07-17 12:16:39 +02:00
2012-06-26 21:06:11 -07:00
2012-05-18 16:48:36 -06:00
2012-06-25 13:50:28 +02:00
2012-07-10 10:32:06 -05:00
2012-05-21 14:31:48 +01:00
2012-07-24 14:07:22 -07:00
2012-05-29 16:22:24 -07:00
2012-05-21 15:09:33 +02:00
2012-05-29 16:22:18 -07:00
2012-06-20 14:39:36 -07:00
2012-07-22 16:07:45 -07:00
2012-07-10 08:36:09 -06:00
2012-06-22 15:16:51 -06:00
2012-07-23 12:17:00 +02:00
2012-06-18 12:13:21 +02:00
2012-07-09 00:10:56 -07:00
2012-05-15 14:59:28 -07:00
2012-07-12 07:54:46 -07:00
2012-07-05 22:12:32 +02:00
2012-07-19 00:02:30 +02:00
2012-07-08 00:25:48 +10:00
2012-05-15 14:59:28 -07:00
2012-06-13 16:52:40 -07:00
2012-06-11 12:26:15 +08:00
2012-07-22 23:58:19 +04:00
2012-07-22 23:58:19 +04:00
2012-06-05 10:46:40 -07:00
2012-05-17 15:18:37 +02:00
2012-07-06 06:01:49 -07:00
2012-07-02 11:39:19 -07:00
2012-06-06 20:43:28 -07:00
2012-07-22 19:26:07 +01:00
2012-05-29 16:22:27 -07:00
2012-05-31 17:49:31 -07:00
2012-05-31 17:49:31 -07:00
2012-05-29 16:22:21 -07:00
2012-07-04 11:51:59 +03:00
2012-05-29 16:22:33 -07:00
2012-07-10 22:40:13 -07:00
2012-07-23 12:27:27 -07:00
2012-06-01 10:37:01 -04:00
2012-05-23 17:12:06 -07:00
2012-05-17 19:02:14 -04:00
2012-06-22 15:36:44 -06:00
2012-05-25 16:34:48 +09:00
2012-07-20 11:28:20 +05:30
2012-05-22 19:07:55 +09:00
2012-07-10 12:08:14 +09:00
2012-07-20 11:28:20 +05:30
2012-05-15 14:59:29 -07:00
2012-06-01 12:58:52 -04:00
2012-07-22 12:39:33 -07:00
2012-05-31 17:49:26 -07:00
2012-06-05 17:32:30 +02:00
2012-07-19 11:02:03 -07:00
2012-07-16 22:31:34 -07:00
2012-07-19 11:02:03 -07:00
2012-06-13 21:16:42 +02:00
2012-07-01 13:31:23 +02:00
2012-06-04 12:28:45 -07:00
2012-06-15 21:48:14 -07:00
2012-05-31 17:49:32 -07:00
2012-06-22 23:02:22 -07:00
2012-07-22 23:57:56 +04:00
2012-07-23 00:58:46 -07:00
2012-06-01 12:58:50 -04:00
2012-06-11 20:07:17 +02:00
2012-07-10 15:47:46 +02:00
2012-05-21 16:16:58 -07:00
2012-07-13 19:34:43 -04:00
2012-05-22 18:27:32 -07:00
2012-07-22 23:57:55 +04:00
2012-07-06 10:53:49 +02:00
2012-06-02 15:21:43 -07:00
2012-07-22 23:57:56 +04:00
2012-06-18 13:42:03 +02:00
2012-05-21 09:00:03 -07:00
2012-05-20 08:27:44 -03:00
2012-06-21 09:32:16 +01:00
2012-06-11 15:47:21 -03:00
2012-05-22 12:16:16 +09:30
2012-05-30 07:55:31 +02:00
c511dc1fb6