tree af9758c01d5c05c073ec57e84777a9985862dbf3
parent 5269519f9f05888bf52c4b71ed84d37c03c8aadb
parent 8edc51c197b8f409bef7b21755254e6f3ce7ed23
author Linus Torvalds <torvalds@linux-foundation.org> 1398015331 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1398015331 -0700

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "Back from long weekend here in India and now the time to send fixes
  for slave dmaengine.
   - Dan's fix of sirf xlate code
   - Jean's fix for timberland
   - edma fixes by Sekhar for SG handling and Yuan for changing init
     call"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: fix eDMA driver as a subsys_initcall
  dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
  platform: Fix timberdale dependencies
  dma: edma: fix incorrect SG list handling