From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Apr 2014 17:35:31 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.15-rc2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=372feacb36211faf18326cfddea85d69b9afe2e5;p=platform%2Fkernel%2Flinux-stable.git

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
---

372feacb36211faf18326cfddea85d69b9afe2e5