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-03-28 16:36:37 +02:00
2012-05-24 15:03:46 +09:00
2010-09-30 09:43:32 +09:00
2010-01-12 15:22:26 +09:00
2012-05-08 12:35:07 +02:00
2012-03-28 18:30:03 +01:00
2010-06-02 16:31:42 +09:00
2010-11-01 09:49:04 -04:00
2010-11-01 09:49:04 -04:00
2010-10-07 14:08:55 +01:00
2010-06-14 17:06:10 +09:00
2010-04-26 19:08:55 +09:00
2012-05-21 17:54:01 +09:00
2012-05-05 13:00:25 +02:00
2009-09-01 17:38:32 +09:00
2010-06-14 15:16:53 +09:00
2012-03-28 18:30:03 +01:00
2011-12-08 10:22:08 -08:00
2010-01-12 18:42:52 +09:00
2012-06-01 12:58:52 -04:00
2012-06-01 12:58:52 -04:00
2012-05-31 17:49:30 -07:00
2011-07-26 16:49:47 -07:00
2011-10-28 15:03:43 +09:00